X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy.ex;h=1764bc789f4a73584fe93b9e511b9e0b066aa216;hb=9cf4c4fa73e68f03791c5cc70505b710be39b677;hp=9be3829724b1123ba09d815271141cb96ad16484;hpb=adcdd21f16c3364b293fefdd7008a531c0627317;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 9be382972..1764bc789 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,65 +1,97 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# 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(message) do
+ defp delist_message(message, threshold) when threshold > 0 do
follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
- message
- |> Map.put("to", [follower_collection])
- |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
+ 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}
+
+ 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
- cond do
- Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") &&
- Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
- length(recipients) - 2
+ if Enum.member?(recipients, Pleroma.Constants.as_public()) do
+ recipients =
+ recipients
+ |> List.delete(Pleroma.Constants.as_public())
+ |> List.delete(follower_collection)
- Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") ||
- Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
- length(recipients) - 1
+ {:public, length(recipients)}
+ else
+ recipients =
+ recipients
+ |> List.delete(follower_collection)
- true ->
- length(recipients)
+ {:not_public, length(recipients)}
end
end
@impl true
def filter(%{"type" => "Create"} = message) do
- delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
-
reject_threshold =
Pleroma.Config.get(
[:mrf_hellthread, :reject_threshold],
Pleroma.Config.get([:mrf_hellthread, :threshold])
)
- recipients = get_recipient_count(message)
-
- cond do
- recipients > reject_threshold and reject_threshold > 0 ->
- {:reject, nil}
-
- recipients > delist_threshold and delist_threshold > 0 ->
- 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, message}
- end
+ delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
- true ->
- {:ok, message}
+ 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(message), do: {:ok, message}
+
+ @impl true
+ def describe,
+ do: {:ok, %{mrf_hellthread: Pleroma.Config.get(:mrf_hellthread) |> Enum.into(%{})}}
end