X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy.ex;h=1764bc789f4a73584fe93b9e511b9e0b066aa216;hb=954acdda2072cac343409b3d17d831b86ac6a18c;hp=d95424493e0c7ccec1fe99182751527f176f8e76;hpb=531507a635917e15e28a72a58ab0f977eefed571;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 d95424493..1764bc789 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,42 +1,97 @@
 # 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
 
-  @impl true
-  def filter(%{"type" => "Create"} = object) do
-    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
-    reject_threshold = Pleroma.Config.get([:mrf_hellthread, :reject_threshold])
-    recipients = (object["to"] || []) ++ (object["cc"] || [])
+  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 =
+      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
+
+    {:ok, message}
+  end
+
+  defp delist_message(message, _threshold), do: {:ok, message}
 
-    cond do
-      length(recipients) > reject_threshold and reject_threshold != 0 ->
+  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)
 
-      length(recipients) > delist_threshold and delist_threshold != 0 ->
-        if Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") or
-             Enum.member?(object["cc"], "https://www.w3.org/ns/activitystreams#Public") do
-          follower_collection = User.get_by_ap_id(object["actor"].follower_address)
+      {:not_public, length(recipients)}
+    end
+  end
 
-          object
-          |> Kernel.update_in(["object", "to"], [follower_collection])
-          |> Kernel.update_in(["object", "cc"], ["https://www.w3.org/ns/activitystreams#Public"])
-          |> Kernel.update_in(["to"], [follower_collection])
-          |> Kernel.update_in(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
+  @impl true
+  def filter(%{"type" => "Create"} = message) do
+    reject_threshold =
+      Pleroma.Config.get(
+        [:mrf_hellthread, :reject_threshold],
+        Pleroma.Config.get([:mrf_hellthread, :threshold])
+      )
 
-          {:ok, object}
-        else
-          {:ok, object}
-        end
+    delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
 
-      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