hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/reports-from-admins' into 'develop'

Browse source 
Suppress report notification for admin actors

See merge request pleroma/pleroma!3301
This commit is contained in:
rinpatch 2021-02-08 10:31:20 +00:00
commit 8babd796da
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/notification.ex
View file

@ -507,8 +507,8 @@ defmodule Pleroma.Notification do
[object_id]
end
def get_potential_receiver_ap_ids(%{data: %{"type" => "Flag"}}) do
User.all_superusers() |> Enum.map(fn user -> user.ap_id end)
def get_potential_receiver_ap_ids(%{data: %{"type" => "Flag", "actor" => actor}}) do
(User.all_superusers() |> Enum.map(fn user -> user.ap_id end)) -- [actor]
end
def get_potential_receiver_ap_ids(activity) do

1
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -377,6 +377,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
:ok <-
maybe_federate(stripped_activity) do
User.all_superusers()
|> Enum.filter(fn user -> user.ap_id != actor end)
|> Enum.filter(fn user -> not is_nil(user.email) end)
|> Enum.each(fn superuser ->
superuser