X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fmrf%2Fhellthread_policy.ex;h=4c6e612b28357025f8b436c6ea3065e1bdce6bf7;hb=0883a706dc376fdfb7de9df1366803e87c8e7c98;hp=0b9caeb11641bfd823db6857894be9825dd90bcd;hpb=0ef0ae35abf7c1f1016175bd446436f9e5dd8fc2;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 0b9caeb11..f6b2c4415 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,42 +1,100 @@
# 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
- @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
+ 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()])
- cond do
- length(recipients) > reject_threshold ->
+ {: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
- length(recipients) > delist_threshold ->
- 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
- object
- |> Kernel.update_in(["object", "to"], [
- User.get_cached_by_ap_id(object["actor"].follower_address)
- ])
- |> Kernel.update_in(["object", "cc"], ["https://www.w3.org/ns/activitystreams#Public"])
- |> Kernel.update_in(["to"], [
- User.get_cached_by_ap_id(object["actor"].follower_address)
- ])
- |> Kernel.update_in(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
- else
- {:ok, object}
- end
-
- true ->
- {:ok, object}
+ 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(object), do: {:ok, object}
+ 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])
+ )
+
+ 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}
+ 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