X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Freject_non_public.ex;h=3092f3272974ef223f7bec3a8f2f0aa18b5f97bd;hb=468cc977be3d4a00760861efb34aa931c84defbb;hp=e3fcc44472b15f408b8baf6785394feaf3b04477;hpb=82225dfc8dbb7bbcf2c9b70a840e7fa8d425dd50;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 e3fcc4447..3092f3272 100644
--- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
+++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
@@ -1,32 +1,51 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do
+  @moduledoc "Rejects non-public (followers-only, direct) activities"
+
+  alias Pleroma.Config
   alias Pleroma.User
+
   @behaviour Pleroma.Web.ActivityPub.MRF
 
+  require Pleroma.Constants
+
   @impl true
-  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 in object["to"] -> "public"
-          public in object["cc"] -> "unlisted"
-          user.follower_address in object["to"] -> "followers"
-          true -> "direct"
-        end
-
-      {flag, object_out} =
-        case visibility do
-          "public" -> {:ok, object}
-          "unlisted" -> {:ok, object}
-          _ -> {:reject, nil}
-        end
-
-      {flag, object_out}
-    else
-      {:ok, object}
+  def filter(%{"type" => "Create"} = object) do
+    user = User.get_cached_by_ap_id(object["actor"])
+
+    # Determine visibility
+    visibility =
+      cond do
+        Pleroma.Constants.as_public() in object["to"] -> "public"
+        Pleroma.Constants.as_public() in object["cc"] -> "unlisted"
+        user.follower_address in object["to"] -> "followers"
+        true -> "direct"
+      end
+
+    policy = Config.get(:mrf_rejectnonpublic)
+
+    cond do
+      visibility in ["public", "unlisted"] ->
+        {:ok, object}
+
+      visibility == "followers" and Keyword.get(policy, :allow_followersonly) ->
+        {:ok, object}
+
+      visibility == "direct" and Keyword.get(policy, :allow_direct) ->
+        {:ok, object}
+
+      true ->
+        {:reject, nil}
     end
   end
+
+  @impl true
+  def filter(object), do: {:ok, object}
+
+  @impl true
+  def describe,
+    do: {:ok, %{mrf_rejectnonpublic: Pleroma.Config.get(:mrf_rejectnonpublic) |> Enum.into(%{})}}
 end