actually commited the changes

This commit is contained in:
Karen Konou 2019-02-04 10:23:43 +01:00
parent 63a4f4b7be
commit 3cf046babb
1 changed files with 8 additions and 8 deletions

View File

@ -15,7 +15,7 @@ defp delist_message(message) do
end end
@impl true @impl true
def filter(%{"type" => "Create"} = object) do def filter(%{"type" => "Create"} = message) do
delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold]) delist_threshold = Pleroma.Config.get([:mrf_hellthread, :delist_threshold])
reject_threshold = reject_threshold =
@ -24,25 +24,25 @@ def filter(%{"type" => "Create"} = object) do
Pleroma.Config.get([:mrf_hellthread, :threshold]) Pleroma.Config.get([:mrf_hellthread, :threshold])
) )
recipients = (object["to"] || []) ++ (object["cc"] || []) recipients = (message["to"] || []) ++ (message["cc"] || [])
cond do cond do
length(recipients) > reject_threshold and reject_threshold > 0 -> length(recipients) > reject_threshold and reject_threshold > 0 ->
{:reject, nil} {:reject, nil}
length(recipients) > delist_threshold and delist_threshold > 0 -> length(recipients) > delist_threshold and delist_threshold > 0 ->
if Enum.member?(object["to"], "https://www.w3.org/ns/activitystreams#Public") or if Enum.member?(message["to"], "https://www.w3.org/ns/activitystreams#Public") or
Enum.member?(object["cc"], "https://www.w3.org/ns/activitystreams#Public") do Enum.member?(message["cc"], "https://www.w3.org/ns/activitystreams#Public") do
{:ok, delist_message(object)} {:ok, delist_message(message)}
else else
{:ok, object} {:ok, message}
end end
true -> true ->
{:ok, object} {:ok, message}
end end
end end
@impl true @impl true
def filter(object), do: {:ok, object} def filter(message), do: {:ok, message}
end end