added optional delist feature

This commit is contained in:
Karen Konou 2019-02-03 20:12:23 +01:00
parent d5d91ae689
commit 0ef0ae35ab
2 changed files with 28 additions and 6 deletions

View File

@ -227,7 +227,9 @@ config :pleroma, :mrf_rejectnonpublic,
allow_followersonly: false, allow_followersonly: false,
allow_direct: false allow_direct: false
config :pleroma, :mrf_hellthread, threshold: 10 config :pleroma, :mrf_hellthread,
delist_threshold: 5,
reject_threshold: 10
config :pleroma, :mrf_simple, config :pleroma, :mrf_simple,
media_removal: [], media_removal: [],

View File

@ -3,17 +3,37 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
alias Pleroma.User
@behaviour Pleroma.Web.ActivityPub.MRF @behaviour Pleroma.Web.ActivityPub.MRF
@impl true @impl true
def filter(%{"type" => "Create"} = object) do def filter(%{"type" => "Create"} = object) do
threshold = Pleroma.Config.get([:mrf_hellthread, :threshold]) delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
reject_threshold = Pleroma.Config.get([:mrf_hellthread, :reject_threshold])
recipients = (object["to"] || []) ++ (object["cc"] || []) recipients = (object["to"] || []) ++ (object["cc"] || [])
if length(recipients) > threshold do cond do
{:reject, nil} length(recipients) > reject_threshold ->
else {:reject, nil}
{:ok, object}
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}
end end
end end