Merge branch 'fix/no-email-no-fail' into 'develop'

Do not fail when user has no email

See merge request pleroma/pleroma!2249
This commit is contained in:
lain 2020-03-04 12:43:06 +00:00
commit 6f7a8c43a2
8 changed files with 75 additions and 3 deletions

View file

@ -660,7 +660,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, activity} <- insert(flag_data, local),
{:ok, stripped_activity} <- strip_report_status_data(activity),
:ok <- maybe_federate(stripped_activity) do
Enum.each(User.all_superusers(), fn superuser ->
User.all_superusers()
|> Enum.filter(fn user -> not is_nil(user.email) end)
|> Enum.each(fn superuser ->
superuser
|> Pleroma.Emails.AdminEmail.report(actor, account, statuses, content)
|> Pleroma.Emails.Mailer.deliver_async()