moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reports: unify sending e-mail for both remote and local reports

This commit is contained in:
William Pitcock 2019-03-14 19:38:46 +00:00
parent 64b0120d67
commit 5c7b774f09
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -394,6 +394,12 @@ def flag(
with flag_data <- make_flag_data(params, additional), with flag_data <- make_flag_data(params, additional),
{:ok, activity} <- insert(flag_data, local), {:ok, activity} <- insert(flag_data, local),
:ok <- maybe_federate(activity) do :ok <- maybe_federate(activity) do
Enum.each(User.all_superusers(), fn superuser ->
superuser
|> Pleroma.AdminEmail.report(actor, account, statuses, content)
|> Pleroma.Mailer.deliver_async()
end)
{:ok, activity} {:ok, activity}
end end
end end

6
lib/pleroma/web/common_api/common_api.ex
View File

@ -287,12 +287,6 @@ def report(user, data) do
content: content_html, content: content_html,
forward: data["forward"] || false forward: data["forward"] || false
}) do }) do
Enum.each(User.all_superusers(), fn superuser ->
superuser
|> Pleroma.AdminEmail.report(user, account, statuses, content_html)
|> Pleroma.Mailer.deliver_async()
end)
{:ok, activity} {:ok, activity}
else else
{:error, err} -> {:error, err} {:error, err} -> {:error, err}