projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/fix-mix-env' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emails
/
admin_email.ex
diff --git
a/lib/pleroma/emails/admin_email.ex
b/lib/pleroma/emails/admin_email.ex
index 8979db2f8269518fa63ceaecfbe61c7dbda0b088..5fe74e2f7ce4ec5c4969e2a64144269ce26ceb72 100644
(file)
--- a/
lib/pleroma/emails/admin_email.ex
+++ b/
lib/pleroma/emails/admin_email.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Emails.AdminEmail do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Emails.AdminEmail do
@@
-18,10
+18,6
@@
defmodule Pleroma.Emails.AdminEmail do
Keyword.get(instance_config(), :notify_email, instance_config()[:email])
end
Keyword.get(instance_config(), :notify_email, instance_config()[:email])
end
- defp user_url(user) do
- Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, user.id)
- end
-
def test_email(mail_to \\ nil) do
html_body = """
<h3>Instance Test Email</h3>
def test_email(mail_to \\ nil) do
html_body = """
<h3>Instance Test Email</h3>
@@
-52,6
+48,9
@@
defmodule Pleroma.Emails.AdminEmail do
status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id)
"<li><a href=\"#{status_url}\">#{status_url}</li>"
status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, id)
"<li><a href=\"#{status_url}\">#{status_url}</li>"
+ %{"id" => id} when is_binary(id) ->
+ "<li><a href=\"#{id}\">#{id}</li>"
+
id when is_binary(id) ->
"<li><a href=\"#{id}\">#{id}</li>"
end)
id when is_binary(id) ->
"<li><a href=\"#{id}\">#{id}</li>"
end)
@@
-69,8
+68,8
@@
defmodule Pleroma.Emails.AdminEmail do
end
html_body = """
end
html_body = """
- <p>Reported by: <a href="#{
user_url(reporter)
}">#{reporter.nickname}</a></p>
- <p>Reported Account: <a href="#{
user_url(account)
}">#{account.nickname}</a></p>
+ <p>Reported by: <a href="#{
reporter.ap_id
}">#{reporter.nickname}</a></p>
+ <p>Reported Account: <a href="#{
account.ap_id
}">#{account.nickname}</a></p>
#{comment_html}
#{statuses_html}
<p>
#{comment_html}
#{statuses_html}
<p>
@@
-86,7
+85,7
@@
defmodule Pleroma.Emails.AdminEmail do
def new_unapproved_registration(to, account) do
html_body = """
def new_unapproved_registration(to, account) do
html_body = """
- <p>New account for review: <a href="#{
user_url(account)
}">@#{account.nickname}</a></p>
+ <p>New account for review: <a href="#{
account.ap_id
}">@#{account.nickname}</a></p>
<blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote>
<a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
"""
<blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote>
<a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
"""