Commit 88f6b61a authored by lain's avatar lain
Browse files

Merge branch '2260-wrong-report-link' into 'develop'

Resolve "Wrong user link in Report email"

Closes #2260

See merge request !3121
parents d77fd6b3 5ddf0be2
Pipeline #32720 passed with stages
in 81 minutes and 53 seconds
...@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ...@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
- Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`. - Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`.
- Polls now always return a `voters_count`, even if they are single-choice - Polls now always return a `voters_count`, even if they are single-choice
- Admin Emails: The ap id is used as the user link in emails now.
<details> <details>
<summary>API Changes</summary> <summary>API Changes</summary>
......
...@@ -18,10 +18,6 @@ defp instance_notify_email do ...@@ -18,10 +18,6 @@ defp instance_notify_email do
Keyword.get(instance_config(), :notify_email, instance_config()[:email]) Keyword.get(instance_config(), :notify_email, instance_config()[:email])
end 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 def test_email(mail_to \\ nil) do
html_body = """ html_body = """
<h3>Instance Test Email</h3> <h3>Instance Test Email</h3>
...@@ -69,8 +65,8 @@ def report(to, reporter, account, statuses, comment) do ...@@ -69,8 +65,8 @@ def report(to, reporter, account, statuses, comment) do
end end
html_body = """ html_body = """
<p>Reported by: <a href="#{user_url(reporter)}">#{reporter.nickname}</a></p> <p>Reported by: <a href="#{reporter.ap_id}">#{reporter.nickname}</a></p>
<p>Reported Account: <a href="#{user_url(account)}">#{account.nickname}</a></p> <p>Reported Account: <a href="#{account.ap_id}">#{account.nickname}</a></p>
#{comment_html} #{comment_html}
#{statuses_html} #{statuses_html}
<p> <p>
...@@ -86,7 +82,7 @@ def report(to, reporter, account, statuses, comment) do ...@@ -86,7 +82,7 @@ def report(to, reporter, account, statuses, comment) do
def new_unapproved_registration(to, account) do def new_unapproved_registration(to, account) do
html_body = """ 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> <blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote>
<a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a> <a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
""" """
......
...@@ -19,8 +19,8 @@ test "build report email" do ...@@ -19,8 +19,8 @@ test "build report email" do
AdminEmail.report(to_user, reporter, account, [%{name: "Test", id: "12"}], "Test comment") AdminEmail.report(to_user, reporter, account, [%{name: "Test", id: "12"}], "Test comment")
status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, "12") status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, "12")
reporter_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) reporter_url = reporter.ap_id
account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) account_url = account.ap_id
assert res.to == [{to_user.name, to_user.email}] assert res.to == [{to_user.name, to_user.email}]
assert res.from == {config[:name], config[:notify_email]} assert res.from == {config[:name], config[:notify_email]}
...@@ -54,7 +54,7 @@ test "new unapproved registration email" do ...@@ -54,7 +54,7 @@ test "new unapproved registration email" do
res = AdminEmail.new_unapproved_registration(to_user, account) res = AdminEmail.new_unapproved_registration(to_user, account)
account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) account_url = account.ap_id
assert res.to == [{to_user.name, to_user.email}] assert res.to == [{to_user.name, to_user.email}]
assert res.from == {config[:name], config[:notify_email]} assert res.from == {config[:name], config[:notify_email]}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment