[#468] Refactored OAuth scopes' defaults & missing selection handling.

[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 cd9f9b1c4dfeb1dc5721338e67a0f4f5e6892c5f..4c6e612b28357025f8b436c6ea3065e1bdce6bf7 100644 (file)
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -6,16 +6,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
   alias Pleroma.User
   @behaviour Pleroma.Web.ActivityPub.MRF
 
-  defp delist_message(object) do
-    follower_collection = User.get_by_ap_id(object["actor"].follower_address)
+  defp delist_message(message) do
+    follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
 
-    object
-    |> Kernel.update_in(["to"], [follower_collection])
-    |> Kernel.update_in(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
+    message
+    |> Map.put("to", [follower_collection])
+    |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
   end
 
   @impl true
-  def filter(%{"type" => "Create"} = object) do
+  def filter(%{"type" => "Create"} = message) do
     delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
 
     reject_threshold =
@@ -24,26 +24,25 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
         Pleroma.Config.get([:mrf_hellthread, :threshold])
       )
 
-    recipients = (object["to"] || []) ++ (object["cc"] || [])
+    recipients = (message["to"] || []) ++ (message["cc"] || [])
 
     cond do
       length(recipients) > reject_threshold and reject_threshold > 0 ->
         {:reject, nil}
 
       length(recipients) > delist_threshold and delist_threshold > 0 ->
-        if Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") or
-             Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") do
-          delist_message(object)
-          {:ok, object}
+        if Enum.member?(message["to"], "https://www.w3.org/ns/activitystreams#Public") or
+             Enum.member?(message["cc"], "https://www.w3.org/ns/activitystreams#Public") do
+          {:ok, delist_message(message)}
         else
-          {:ok, object}
+          {:ok, message}
         end
 
       true ->
-        {:ok, object}
+        {:ok, message}
     end
   end
 
   @impl true
-  def filter(object), do: {:ok, object}
+  def filter(message), do: {:ok, message}
 end