X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Freject_non_public.ex;h=4197be847c635167e95bd30af053b00f3f0aa0cf;hb=ede3fd7459c437af19a736622e09d68d4b7acf61;hp=b6936fe90081dceb854d6146b10578db87685858;hpb=2e294ee44a1baa7c0d3ac6b2905a70ed4e05cffb;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 b6936fe90..4197be847 100644
--- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
+++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
@@ -1,49 +1,50 @@
+# 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
   @behaviour Pleroma.Web.ActivityPub.MRF
 
-  @mrf_rejectnonpublic Application.get_env(:pleroma, :mrf_rejectnonpublic)
-  @allow_followersonly Keyword.get(@mrf_rejectnonpublic, :allow_followersonly)
-  @allow_direct Keyword.get(@mrf_rejectnonpublic, :allow_direct)
-
   @impl true
-  def filter(object) do
-    if object["type"] == "Create" do
-      user = User.get_cached_by_ap_id(object["actor"])
-      public = "https://www.w3.org/ns/activitystreams#Public"
-
-      # 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
+  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
-        "public" ->
-          {:ok, object}
+    # 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
+
+    policy = Pleroma.Config.get(:mrf_rejectnonpublic)
+
+    case visibility do
+      "public" ->
+        {:ok, object}
 
-        "unlisted" ->
+      "unlisted" ->
+        {:ok, object}
+
+      "followers" ->
+        with true <- Keyword.get(policy, :allow_followersonly) do
           {:ok, object}
+        else
+          _e -> {:reject, nil}
+        end
 
-        "followers" ->
-          with true <- @allow_followersonly do
-            {:ok, object}
-          else
-            _e -> {:reject, nil}
-          end
-
-        "direct" ->
-          with true <- @allow_direct do
-            {:ok, object}
-          else
-            _e -> {:reject, nil}
-          end
-      end
-    else
-      {:ok, object}
+      "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