fallback to the old behaviour
admin and user mailers
This commit is contained in:
parent
fe511a6c65
commit
a64eb2b389
2 changed files with 6 additions and 2 deletions
|
@ -11,7 +11,10 @@ defmodule Pleroma.AdminEmail do
|
|||
|
||||
defp instance_config, do: Pleroma.Config.get(:instance)
|
||||
defp instance_name, do: instance_config()[:name]
|
||||
defp instance_notify_email, do: instance_config()[:notify_email]
|
||||
|
||||
defp instance_notify_email do
|
||||
Keyword.get(instance_config(), :notify_email, instance_config()[:email])
|
||||
end
|
||||
|
||||
defp user_url(user) do
|
||||
Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname)
|
||||
|
|
|
@ -15,7 +15,8 @@ defp instance_config, do: Pleroma.Config.get(:instance)
|
|||
defp instance_name, do: instance_config()[:name]
|
||||
|
||||
defp sender do
|
||||
{instance_name(), instance_config()[:notify_email]}
|
||||
email = Keyword.get(instance_config(), :notify_email, instance_config()[:email])
|
||||
{instance_name(), email}
|
||||
end
|
||||
|
||||
defp recipient(email, nil), do: email
|
||||
|
|
Loading…
Reference in a new issue