X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy.ex;h=1764bc789f4a73584fe93b9e511b9e0b066aa216;hb=9cf4c4fa73e68f03791c5cc70505b710be39b677;hp=1f09b4e667605996ed143255d4cee723551fbb67;hpb=bef9b9cb669d6c1081eb83c624af89dbf9a8b9da;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 1f09b4e66..1764bc789 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,40 +1,46 @@
# 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
- 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
+ |> 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
- 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 +48,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)
+ 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
- |> List.delete(follower_collection)
+ recipients =
+ recipients
+ |> List.delete(follower_collection)
{:not_public, length(recipients)}
end
@@ -62,8 +72,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}
@@ -72,4 +90,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
@impl true
def filter(message), do: {:ok, message}
+
+ @impl true
+ def describe,
+ do: {:ok, %{mrf_hellthread: Pleroma.Config.get(:mrf_hellthread) |> Enum.into(%{})}}
end