hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adding notify_email setting for trigger emails

Browse source
This commit is contained in:
Alex S 2019-04-10 17:57:41 +07:00
commit fe13a1d78c
12 changed files with 132 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/emails/admin_email.ex
View file

@ -11,7 +11,7 @@ defmodule Pleroma.AdminEmail do
defp instance_config, do: Pleroma.Config.get(:instance)
defp instance_name, do: instance_config()[:name]
defp instance_email, do: instance_config()[:email]
defp instance_notify_email, do: instance_config()[:notify_email]
defp user_url(user) do
Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
@ -59,7 +59,7 @@ defmodule Pleroma.AdminEmail do
new()
|> to({to.name, to.email})
|> from({instance_name(), instance_email()})
|> from({instance_name(), instance_notify_email()})
|> reply_to({reporter.name, reporter.email})
|> subject("#{instance_name()} Report")
|> html_body(html_body)

2
lib/pleroma/emails/user_email.ex
View file

@ -15,7 +15,7 @@ defmodule Pleroma.UserEmail do
defp instance_name, do: instance_config()[:name]
defp sender do
{instance_name(), instance_config()[:email]}
{instance_name(), instance_config()[:notify_email]}
end
defp recipient(email, nil), do: email