fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-18 12:30:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect post links in strikes when the account is remote (#23611)

Browse source
This commit is contained in:
Claire 2023-03-15 04:14:47 +01:00 committed by GitHub
parent 9875be09fe
commit cf50667e26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/reports/actions/preview.html.haml
View file

@ -54,14 +54,14 @@
.strike-card__statuses-list__item .strike-card__statuses-list__item
- if (status = status_map[status_id.to_i]) - if (status = status_map[status_id.to_i])
.one-liner .one-liner
= link_to short_account_status_url(@report.target_account, status_id), class: 'emojify' do .emojify= one_line_preview(status)
= one_line_preview(status)
- status.ordered_media_attachments.each do |media_attachment| - status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description } %abbr{ title: media_attachment.description }
= fa_icon 'link' = fa_icon 'link'
= media_attachment.file_file_name = media_attachment.file_file_name
.strike-card__statuses-list__item__meta .strike-card__statuses-list__item__meta
= link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank' do
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- unless status.application.nil? - unless status.application.nil?
· ·

4
app/views/disputes/strikes/show.html.haml
View file

@ -50,14 +50,14 @@
.strike-card__statuses-list__item .strike-card__statuses-list__item
- if (status = status_map[status_id.to_i]) - if (status = status_map[status_id.to_i])
.one-liner .one-liner
= link_to short_account_status_url(@strike.target_account, status_id), class: 'emojify' do .emojify= one_line_preview(status)
= one_line_preview(status)
- status.ordered_media_attachments.each do |media_attachment| - status.ordered_media_attachments.each do |media_attachment|
%abbr{ title: media_attachment.description } %abbr{ title: media_attachment.description }
= fa_icon 'link' = fa_icon 'link'
= media_attachment.file_file_name = media_attachment.file_file_name
.strike-card__statuses-list__item__meta .strike-card__statuses-list__item__meta
= link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank' do
%time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- unless status.application.nil? - unless status.application.nil?
· ·