mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-24 15:16:26 +09:00
Code

Fix links to the Web UI in notifications (#19981)

Browse Source 
Most of the old routes are broken because of the /web removal.
This commit is contained in:
Claire 2022-11-07 15:42:58 +01:00 committed by GitHub
parent 8515bc7962
commit e1227457f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/authorize_interactions/_post_follow_actions.html.haml
View File

@ -1,4 +1,4 @@
.post-follow-actions
%div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@resource.id}"), class: 'button button--block'
%div= link_to t('authorize_follow.post_follow.web'), web_url("@#{@resource.pretty_acct}"), class: 'button button--block'
%div= link_to t('authorize_follow.post_follow.return'), ActivityPub::TagManager.instance.url_for(@resource), class: 'button button--block'
%div= t('authorize_follow.post_follow.close')

2
app/views/notification_mailer/_status.html.haml
View File

@ -42,4 +42,4 @@
= link_to a.remote_url, a.remote_url
%p.status-footer
= link_to l(status.created_at), web_url("statuses/#{status.id}")
= link_to l(status.created_at), web_url("@#{status.account.pretty_acct}/#{status.id}")

2
app/views/notification_mailer/_status.text.erb
View File

@ -5,4 +5,4 @@
<% end %>
> <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
<%= raw t('application_mailer.view')%> <%= web_url("statuses/#{status.id}") %>
<%= raw t('application_mailer.view')%> <%= web_url("@#{status.account.pretty_acct}/#{status.id}") %>

2
app/views/notification_mailer/favourite.html.haml
View File

@ -41,5 +41,5 @@
%tbody
%tr
%td.button-primary
= link_to web_url("statuses/#{@status.id}") do
= link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
%span= t 'application_mailer.view_status'

2
app/views/notification_mailer/follow.html.haml
View File

@ -39,5 +39,5 @@
%tbody
%tr
%td.button-primary
= link_to web_url("accounts/#{@account.id}") do
= link_to web_url("@#{@account.pretty_acct}") do
%span= t 'application_mailer.view_profile'

2
app/views/notification_mailer/follow.text.erb
View File

@ -2,4 +2,4 @@
<%= raw t('notification_mailer.follow.body', name: @account.pretty_acct) %>
<%= raw t('application_mailer.view')%> <%= web_url("accounts/#{@account.id}") %>
<%= raw t('application_mailer.view')%> <%= web_url("@#{@account.pretty_acct}") %>

2
app/views/notification_mailer/mention.html.haml
View File

@ -41,5 +41,5 @@
%tbody
%tr
%td.button-primary
= link_to web_url("statuses/#{@status.id}") do
= link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
%span= t 'notification_mailer.mention.action'

2
app/views/notification_mailer/reblog.html.haml
View File

@ -41,5 +41,5 @@
%tbody
%tr
%td.button-primary
= link_to web_url("statuses/#{@status.id}") do
= link_to web_url("@#{@status.account.pretty_acct}/#{@status.id}") do
%span= t 'application_mailer.view_status'

2
app/views/statuses/_detailed_status.html.haml
View File

@ -77,4 +77,4 @@
- if user_signed_in?
·
= link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank'
= link_to t('statuses.open_in_web'), web_url("@#{status.account.pretty_acct}/#{status.id}"), class: 'detailed-status__application', target: '_blank'