X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy.ex;h=4c6e612b28357025f8b436c6ea3065e1bdce6bf7;hb=0883a706dc376fdfb7de9df1366803e87c8e7c98;hp=cd9f9b1c4dfeb1dc5721338e67a0f4f5e6892c5f;hpb=e10cda7541f5d76a32d0bf27d90a51c5fc8e7fcf;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index cd9f9b1c4..f6b2c4415 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,49 +1,100 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
   alias Pleroma.User
+
+  require Pleroma.Constants
+
+  @moduledoc "Block messages with too much mentions (configurable)"
+
   @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, threshold) when threshold > 0 do
+    follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
+    to = message["to"] || []
+    cc = message["cc"] || []
+
+    follower_collection? = Enum.member?(to ++ cc, follower_collection)
+
+    message =
+      case get_recipient_count(message) do
+        {:public, recipients}
+        when follower_collection? and recipients > threshold ->
+          message
+          |> Map.put("to", [follower_collection])
+          |> Map.put("cc", [Pleroma.Constants.as_public()])
+
+        {:public, recipients} when recipients > threshold ->
+          message
+          |> Map.put("to", [])
+          |> Map.put("cc", [Pleroma.Constants.as_public()])
+
+        _ ->
+          message
+      end
 
-    object
-    |> Kernel.update_in(["to"], [follower_collection])
-    |> Kernel.update_in(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
+    {:ok, message}
   end
 
-  @impl true
-  def filter(%{"type" => "Create"} = object) do
-    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_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 > threshold do
+        {:reject, nil}
+      else
+        {:ok, message}
+      end
+    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, Pleroma.Constants.as_public()) do
+      recipients =
+        recipients
+        |> List.delete(Pleroma.Constants.as_public())
+        |> List.delete(follower_collection)
+
+      {:public, length(recipients)}
+    else
+      recipients =
+        recipients
+        |> List.delete(follower_collection)
+
+      {:not_public, length(recipients)}
+    end
+  end
+
+  @impl true
+  def filter(%{"type" => "Create", "object" => %{"type" => object_type}} = message)
+      when object_type in ~w{Note Article} do
     reject_threshold =
       Pleroma.Config.get(
         [:mrf_hellthread, :reject_threshold],
         Pleroma.Config.get([:mrf_hellthread, :threshold])
       )
 
-    recipients = (object["to"] || []) ++ (object["cc"] || [])
-
-    cond do
-      length(recipients) > reject_threshold and reject_threshold > 0 ->
-        {:reject, nil}
+    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
 
-      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}
-        else
-          {:ok, object}
-        end
-
-      true ->
-        {:ok, object}
+    with {:ok, message} <- reject_message(message, reject_threshold),
+         {:ok, message} <- delist_message(message, delist_threshold) do
+      {:ok, message}
+    else
+      _e -> {:reject, nil}
     end
   end
 
   @impl true
-  def filter(object), do: {:ok, object}
+  def filter(message), do: {:ok, message}
+
+  @impl true
+  def describe,
+    do: {:ok, %{mrf_hellthread: Pleroma.Config.get(:mrf_hellthread) |> Enum.into(%{})}}
 end