X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Freject_non_public.ex;h=ea3df1b4d0eb98a894f35144c64597bbac15930a;hb=5e2b491276d5cd8d90fddf219f7653d1c9b31ef3;hp=eb9580445c0c5cfab7cfc1e80036fb9001db3b2d;hpb=f69d38e455c224c459cd37088698542f541bcd1d;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
index eb9580445..ea3df1b4d 100644
--- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
+++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
@@ -1,33 +1,51 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
   alias Pleroma.User
+  @moduledoc "Rejects non-public (followers-only, direct) activities"
   @behaviour Pleroma.Web.ActivityPub.MRF
 
-  def filter(object) do
-    if object["type"] == "Create" do
-      user = User.get_by_ap_id(object["actor"])
-      public = "https://www.w3.org/ns/activitystreams#Public"
-
-      #Determine visibility
-      visibility =
-        cond do
-          #Public
-          public in object["to"] -> "p"
-          #Unlisted
-          public in object["cc"] -> "u"
-          #Followers-only
-          user.follower_address in object["to"] -> "f"
-          #Direct
-          true -> "d"
-        end
+  @impl true
+  def filter(%{"type" => "Create"} = object) do
+    user = User.get_cached_by_ap_id(object["actor"])
+    public = "https://www.w3.org/ns/activitystreams#Public"
 
-      case visibility do
-        "p" -> {:ok, object}
-        "u" -> {:ok, object}
-        _ -> {:reject, nil}
+    # Determine visibility
+    visibility =
+      cond do
+        public in object["to"] -> "public"
+        public in object["cc"] -> "unlisted"
+        user.follower_address in object["to"] -> "followers"
+        true -> "direct"
       end
-    else
-      {:ok, object}
+
+    policy = Pleroma.Config.get(:mrf_rejectnonpublic)
+
+    case visibility do
+      "public" ->
+        {:ok, object}
+
+      "unlisted" ->
+        {:ok, object}
+
+      "followers" ->
+        with true <- Keyword.get(policy, :allow_followersonly) do
+          {:ok, object}
+        else
+          _e -> {:reject, nil}
+        end
+
+      "direct" ->
+        with true <- Keyword.get(policy, :allow_direct) do
+          {:ok, object}
+        else
+          _e -> {:reject, nil}
+        end
     end
   end
 
+  @impl true
+  def filter(object), do: {:ok, object}
 end