Page MenuHomePhorge
Files F85826369

No OneTemporary
Actions

Authored By
Unknown
Size
3 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 9be382972..1f09b4e66 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -1,65 +1,75 @@
# 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(message) do
+ delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
- message
- |> Map.put("to", [follower_collection])
- |> Map.put("cc", ["https://www.w3.org/ns/activitystreams#Public"])
- end
-
- defp get_recipient_count(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
+ message =
+ with {:public, recipients} <- get_recipient_count(message) do
+ 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
- true ->
- length(recipients)
- end
+ {:ok, message}
end
- @impl true
- def filter(%{"type" => "Create"} = message) do
- delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
-
+ defp reject_message(message) do
reject_threshold =
Pleroma.Config.get(
[:mrf_hellthread, :reject_threshold],
Pleroma.Config.get([:mrf_hellthread, :threshold])
)
- recipients = get_recipient_count(message)
-
- cond do
- recipients > reject_threshold and reject_threshold > 0 ->
+ with {_, recipients} <- get_recipient_count(message) do
+ if recipients > reject_threshold and reject_threshold > 0 do
{:reject, nil}
+ else
+ {:ok, message}
+ end
+ end
+ end
- 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
+ defp get_recipient_count(message) do
+ recipients = (message["to"] || []) ++ (message["cc"] || [])
+ follower_collection = User.get_cached_by_ap_id(message["actor"]).follower_address
- true ->
- {:ok, message}
+ 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
@impl true
def filter(message), do: {:ok, message}
end

File Metadata

Mime Type
text/x-diff
Expires
Fri, Oct 30, 6:50 AM (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1799719
Default Alt Text
(3 KB)

Event Timeline