From f09a1ca5a1ab395d79d94cea9e204832db67e9f8 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 01:30:30 +0200 Subject: [PATCH] Add replied to visibility for admin statuses show --- app/helpers/admin/account_moderation_notes_helper.rb | 4 ++-- app/views/admin/statuses/show.html.haml | 10 +++++++--- config/locales/en.yml | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 2a3d954a35..7c931c1157 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -12,12 +12,12 @@ module Admin::AccountModerationNotesHelper ) end - def admin_account_inline_link_to(account) + def admin_account_inline_link_to(account, path: nil) return if account.nil? link_to( account_inline_text(account), - admin_account_path(account.id), + path || admin_account_path(account.id), class: class_names('inline-name-tag', suspended: suspended_account?(account)), title: account.acct ) diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml index bf3f8d4610..a61020f1de 100644 --- a/app/views/admin/statuses/show.html.haml +++ b/app/views/admin/statuses/show.html.haml @@ -54,10 +54,14 @@ %h3= t('admin.statuses.contents') .status__card - - if @status.reblog? + - if @status.reblog? || @status.reply? .status__prepend - = fa_icon('retweet fw') - = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(@status.proper.account)) + - if @status.reblog? + = fa_icon('retweet fw') + = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(@status.proper.account)) + - elsif @status.reply? + = fa_icon('reply fw') + = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(@status.in_reply_to_account, path: admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id))) .status__content>< - if @status.proper.spoiler_text.blank? = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis) diff --git a/config/locales/en.yml b/config/locales/en.yml index a5f5422504..7f8da89fd6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -825,12 +825,13 @@ en: open: Open post original_status: Original post reblogs: Reblogs + replied_to_html: Replied to %{acct_link} status_changed: Post changed status_title: Post by @%{name} title: Account posts - @%{name} trending: Trending - visibility: Visibility view_publicly: View publicly + visibility: Visibility with_media: With media strikes: actions: