Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'

[akkoma] / lib / pleroma / web / activity_pub / mrf / hellthread_policy.ex

diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index 1f09b4e667605996ed143255d4cee723551fbb67..a699f6a7e89c0242942ab5011fe991ce86e46670 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -4,37 +4,40 @@
 
 defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
   alias Pleroma.User
+  @moduledoc "Block messages with too much mentions (configurable)"
+
   @behaviour Pleroma.Web.ActivityPub.MRF
 
-  defp delist_message(message) do
-    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
+  defp delist_message(message, threshold) when threshold > 0 do
     follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
 
+    follower_collection? = Enum.member?(message["to"] ++ message["cc"], follower_collection)
+
     message =
-      with {:public, recipients} <- get_recipient_count(message) do
-        if recipients > delist_threshold and delist_threshold > 0 do
+      case get_recipient_count(message) do
+        {:public, recipients}
+        when follower_collection? and recipients > threshold ->
           message
           |> Map.put("to", [follower_collection])
           |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
-        else
+
+        {:public, recipients} when recipients > threshold ->
+          message
+          |> Map.put("to", [])
+          |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
+
+        _ ->
           message
-        end
-      else
-        _ -> message
       end
 
     {:ok, message}
   end
 
-  defp reject_message(message) do
-    reject_threshold =
-      Pleroma.Config.get(
-        [:mrf_hellthread, :reject_threshold],
-        Pleroma.Config.get([:mrf_hellthread, :threshold])
-      )
+  defp delist_message(message, _threshold), do: {:ok, message}
 
+  defp reject_message(message, threshold) when threshold > 0 do
     with {_, recipients} <- get_recipient_count(message) do
-      if recipients > reject_threshold and reject_threshold > 0 do
+      if recipients > threshold do
         {:reject, nil}
       else
         {:ok, message}
@@ -42,19 +45,23 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
     end
   end
 
+  defp reject_message(message, _threshold), do: {:ok, message}
+
   defp get_recipient_count(message) do
     recipients = (message["to"] || []) ++ (message["cc"] || [])
     follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
 
     if Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") do
-      recipients
-      |> List.delete("https://www.w3.org/ns/activitystreams#Public")
-      |> List.delete(follower_collection)
+      recipients =
+        recipients
+        |> List.delete("https://www.w3.org/ns/activitystreams#Public")
+        |> List.delete(follower_collection)
 
       {:public, length(recipients)}
     else
-      recipients
-      |> List.delete(follower_collection)
+      recipients =
+        recipients
+        |> List.delete(follower_collection)
 
       {:not_public, length(recipients)}
     end
@@ -62,8 +69,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
 
   @impl true
   def filter(%{"type" => "Create"} = message) do
-    with {:ok, message} <- reject_message(message),
-         {:ok, message} <- delist_message(message) do
+    reject_threshold =
+      Pleroma.Config.get(
+        [:mrf_hellthread, :reject_threshold],
+        Pleroma.Config.get([:mrf_hellthread, :threshold])
+      )
+
+    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
+
+    with {:ok, message} <- reject_message(message, reject_threshold),
+         {:ok, message} <- delist_message(message, delist_threshold) do
       {:ok, message}
     else
       _e -> {:reject, nil}