Page MenuHomePhorge
Files F85830883

No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index cd9f9b1c4..1c2de555f 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,49 +1,48 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
alias Pleroma.User
@behaviour Pleroma.Web.ActivityPub.MRF
- defp delist_message(object) do
- follower_collection = User.get_by_ap_id(object["actor"].follower_address)
+ defp delist_message(message) do
+ follower_collection = User.get_by_ap_id(message["actor"].follower_address)
- object
- |> Kernel.update_in(["to"], [follower_collection])
- |> Kernel.update_in(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
+ message
+ |> Map.put(["to"], [follower_collection])
+ |> Map.put(["cc"], ["https://www.w3.org/ns/activitystreams#Public"])
end
@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],
Pleroma.Config.get([:mrf_hellthread, :threshold])
)
recipients = (object["to"] || []) ++ (object["cc"] || [])
cond do
length(recipients) > reject_threshold and reject_threshold > 0 ->
{:reject, nil}
length(recipients) > delist_threshold and delist_threshold > 0 ->
if Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") or
- Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") do
- delist_message(object)
- {:ok, object}
+ Enum.member?(object["cc"], "https://www.w3.org/ns/activitystreams#Public") do
+ {:ok, delist_message(object)}
else
{:ok, object}
end
true ->
{:ok, object}
end
end
@impl true
def filter(object), do: {:ok, object}
end

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 1, 7:18 AM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1802786
Default Alt Text
(2 KB)

Event Timeline