projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emails
/
admin_email.ex
diff --git
a/lib/pleroma/emails/admin_email.ex
b/lib/pleroma/emails/admin_email.ex
index e730410c5e818a6c542e23ea651749f05672f155..c14be02dd98ce0f21869d3d2f8e161ad78b647ee 100644
(file)
--- a/
lib/pleroma/emails/admin_email.ex
+++ b/
lib/pleroma/emails/admin_email.ex
@@
-2,7
+2,7
@@
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.AdminEmail do
+defmodule Pleroma.
Emails.
AdminEmail do
@moduledoc "Admin emails"
import Swoosh.Email
@moduledoc "Admin emails"
import Swoosh.Email
@@
-29,7
+29,7
@@
defmodule Pleroma.AdminEmail do
end
statuses_html =
end
statuses_html =
- if length(statuses) > 0 do
+ if
is_list(statuses) &&
length(statuses) > 0 do
statuses_list_html =
statuses
|> Enum.map(fn
statuses_list_html =
statuses
|> Enum.map(fn
@@
-63,7
+63,6
@@
defmodule Pleroma.AdminEmail do
new()
|> to({to.name, to.email})
|> from({instance_name(), instance_notify_email()})
new()
|> to({to.name, to.email})
|> from({instance_name(), instance_notify_email()})
- |> reply_to({reporter.name, reporter.email})
|> subject("#{instance_name()} Report")
|> html_body(html_body)
end
|> subject("#{instance_name()} Report")
|> html_body(html_body)
end