X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Femails%2Fadmin_email.ex;h=55f61024e33e7394319ccd9807bbeacc4c354778;hb=780ac9cedb9a5df96bce763f586779c4297b0f0a;hp=afefccec5e2b928149c6ad30c902a7d07dc1f3fa;hpb=fee360e581d9aced145d21429eba5a63b3f682d1;p=akkoma
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex
index afefccec5..55f61024e 100644
--- a/lib/pleroma/emails/admin_email.ex
+++ b/lib/pleroma/emails/admin_email.ex
@@ -1,20 +1,37 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
A test email was requested. Hello. :)
+ """ + + new() + |> to(mail_to || Config.get([:instance, :email])) + |> from({instance_name(), instance_notify_email()}) + |> subject("Instance Test Email") + |> html_body(html_body) end def report(to, reporter, account, statuses, comment) do @@ -26,7 +43,7 @@ defmodule Pleroma.AdminEmail do end statuses_html = - if length(statuses) > 0 do + if is_list(statuses) && length(statuses) > 0 do statuses_list_html = statuses |> Enum.map(fn @@ -59,8 +76,7 @@ defmodule Pleroma.AdminEmail do new() |> to({to.name, to.email}) - |> from({instance_name(), instance_email()}) - |> reply_to({reporter.name, reporter.email}) + |> from({instance_name(), instance_notify_email()}) |> subject("#{instance_name()} Report") |> html_body(html_body) end