X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Femails%2Fadmin_email.ex;h=b15e4041bd4295d17d3a6a5124748ff87c60778a;hb=4b10804f21b80b74f9f9f85c9ecd6e1ec791255d;hp=9b20c7e08197f23425612b4b79b54fbac0302933;hpb=bff9eb5ef7ad446376f68807d4e51db5f2de9515;p=akkoma
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex
index 9b20c7e08..b15e4041b 100644
--- a/lib/pleroma/emails/admin_email.ex
+++ b/lib/pleroma/emails/admin_email.ex
@@ -2,7 +2,7 @@
# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.AdminEmail do
+defmodule Pleroma.Emails.AdminEmail do
@moduledoc "Admin emails"
import Swoosh.Email
@@ -11,10 +11,13 @@ 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
+ 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)
+ Helpers.feed_url(Pleroma.Web.Endpoint, :feed_redirect, user.id)
end
def report(to, reporter, account, statuses, comment) do
@@ -26,12 +29,16 @@ 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 %{id: id} ->
- status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id)
- "
#{status_url}"
+ |> Enum.map(fn
+ %{id: id} ->
+ status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id)
+ "#{status_url}"
+
+ id when is_binary(id) ->
+ "#{id}"
end)
|> Enum.join("\n")
@@ -55,8 +62,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