refactored code
This commit is contained in:
parent
adcdd21f16
commit
bef9b9cb66
@ -7,56 +7,66 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
|
|||||||
@behaviour Pleroma.Web.ActivityPub.MRF
|
@behaviour Pleroma.Web.ActivityPub.MRF
|
||||||
|
|
||||||
defp delist_message(message) do
|
defp delist_message(message) do
|
||||||
|
delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
|
||||||
follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
|
follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
|
||||||
|
|
||||||
message
|
message =
|
||||||
|> Map.put("to", [follower_collection])
|
with {:public, recipients} <- get_recipient_count(message) do
|
||||||
|> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
|
if recipients > delist_threshold and delist_threshold > 0 do
|
||||||
|
message
|
||||||
|
|> Map.put("to", [follower_collection])
|
||||||
|
|> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
|
||||||
|
else
|
||||||
|
message
|
||||||
|
end
|
||||||
|
else
|
||||||
|
_ -> message
|
||||||
|
end
|
||||||
|
|
||||||
|
{:ok, message}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp get_recipient_count(message) do
|
defp reject_message(message) do
|
||||||
recipients = (message["to"] || []) ++ (message["cc"] || [])
|
|
||||||
|
|
||||||
cond do
|
|
||||||
Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") &&
|
|
||||||
Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
|
|
||||||
length(recipients) - 2
|
|
||||||
|
|
||||||
Enum.member?(recipients, "https://www.w3.org/ns/activitystreams#Public") ||
|
|
||||||
Enum.find(recipients, &String.ends_with?(&1, "/followers")) ->
|
|
||||||
length(recipients) - 1
|
|
||||||
|
|
||||||
true ->
|
|
||||||
length(recipients)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@impl true
|
|
||||||
def filter(%{"type" => "Create"} = message) do
|
|
||||||
delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
|
|
||||||
|
|
||||||
reject_threshold =
|
reject_threshold =
|
||||||
Pleroma.Config.get(
|
Pleroma.Config.get(
|
||||||
[:mrf_hellthread, :reject_threshold],
|
[:mrf_hellthread, :reject_threshold],
|
||||||
Pleroma.Config.get([:mrf_hellthread, :threshold])
|
Pleroma.Config.get([:mrf_hellthread, :threshold])
|
||||||
)
|
)
|
||||||
|
|
||||||
recipients = get_recipient_count(message)
|
with {_, recipients} <- get_recipient_count(message) do
|
||||||
|
if recipients > reject_threshold and reject_threshold > 0 do
|
||||||
cond do
|
|
||||||
recipients > reject_threshold and reject_threshold > 0 ->
|
|
||||||
{:reject, nil}
|
{:reject, nil}
|
||||||
|
else
|
||||||
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
|
|
||||||
|
|
||||||
true ->
|
|
||||||
{:ok, message}
|
{:ok, message}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
{:public, length(recipients)}
|
||||||
|
else
|
||||||
|
recipients
|
||||||
|
|> List.delete(follower_collection)
|
||||||
|
|
||||||
|
{:not_public, length(recipients)}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def filter(%{"type" => "Create"} = message) do
|
||||||
|
with {:ok, message} <- reject_message(message),
|
||||||
|
{:ok, message} <- delist_message(message) do
|
||||||
|
{:ok, message}
|
||||||
|
else
|
||||||
|
_e -> {:reject, nil}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user