aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-14 19:38:46 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-14 19:44:08 +0000
commit5c7b774f09d86414e6a8ef6494ccd2e6a76c1396 (patch)
treec1e1015c7adfdf4bb83a294c36d0d6281dfcbbcf
parent64b0120d678b106f33d5c903749fcac5ed5a1ed7 (diff)
downloadpleroma-5c7b774f09d86414e6a8ef6494ccd2e6a76c1396.tar.gz
reports: unify sending e-mail for both remote and local reports
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex6
-rw-r--r--lib/pleroma/web/common_api/common_api.ex6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 7d21fe65f..32f69e0fa 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -394,6 +394,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
with flag_data <- make_flag_data(params, additional),
{:ok, activity} <- insert(flag_data, local),
: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}
end
end
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index ead4928b5..edbcd3397 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -287,12 +287,6 @@ defmodule Pleroma.Web.CommonAPI do
content: content_html,
forward: data["forward"] || false
}) do
- Enum.each(User.all_superusers(), fn superuser ->
- superuser
- |> Pleroma.AdminEmail.report(user, account, statuses, content_html)
- |> Pleroma.Mailer.deliver_async()
- end)
-
{:ok, activity}
else
{:error, err} -> {:error, err}