diff options
author | kaniini <nenolod@gmail.com> | 2019-03-16 19:27:56 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-03-16 19:27:56 +0000 |
commit | 6d6f48d0795cc12d3c5aca5d90ae51b10086996d (patch) | |
tree | 15c78f3bff24635de54ed07197cf4830bc72aa73 /lib/pleroma/web/common_api/common_api.ex | |
parent | 28df397454de5fd824490086206c70803b4da2d5 (diff) | |
parent | 423fd07928d64dd7810ac408265a37ae1274956f (diff) | |
download | pleroma-6d6f48d0795cc12d3c5aca5d90ae51b10086996d.tar.gz |
Merge branch 'feature/federated-flags' into 'develop'
Federated reports
See merge request pleroma/pleroma!935
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 84d66efc9..b5f79c3bf 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -284,14 +284,9 @@ defmodule Pleroma.Web.CommonAPI do actor: user, account: account, statuses: statuses, - content: content_html + 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} |