X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Femails%2Fadmin_email.ex;h=88bc78aec52edce6a13d6fceb70443c36b712d7c;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=d0e254362ba60c386582fc3c4f5835da3b36712a;hpb=e2b3a27204ca511a2e455a1151fdea36fdc0e53d;p=akkoma
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex
index d0e254362..88bc78aec 100644
--- a/lib/pleroma/emails/admin_email.ex
+++ b/lib/pleroma/emails/admin_email.ex
@@ -1,5 +1,5 @@
# 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 @@ -37,6 +48,9 @@ defmodule Pleroma.Emails.AdminEmail do status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id) "Reported by: #{reporter.nickname}
-Reported Account: #{account.nickname}
+Reported by: #{reporter.nickname}
+Reported Account: #{account.nickname}
#{comment_html} #{statuses_html} ++ View Reports in AdminFE """ 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 + + def new_unapproved_registration(to, account) do + html_body = """ +
New account for review: @#{account.nickname}
+#{HTML.strip_tags(account.registration_reason)}+ Visit AdminFE + """ + + new() + |> to({to.name, to.email}) + |> from({instance_name(), instance_notify_email()}) + |> subject("New account up for review on #{instance_name()} (@#{account.nickname})") + |> html_body(html_body) + end end