From e64093f53ba8f0319df18418da796443da200206 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 00:36:12 +0200 Subject: [PATCH 1/5] Improve display of statuses in admin panel --- app/controllers/admin/statuses_controller.rb | 2 + app/javascript/styles/mastodon/admin.scss | 22 +++++++ app/views/admin/reports/_status.html.haml | 5 +- app/views/admin/statuses/show.html.haml | 60 ++++++++++++++++++-- config/locales/en.yml | 4 ++ 5 files changed, 88 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb index e53b22dca32..40d1a481b28 100644 --- a/app/controllers/admin/statuses_controller.rb +++ b/app/controllers/admin/statuses_controller.rb @@ -16,6 +16,8 @@ module Admin def show authorize [:admin, @status], :show? + + @status_batch_action = Admin::StatusBatchAction.new end def batch diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 06a3b520216..acf36e46f10 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1894,3 +1894,25 @@ a.sparkline { } } } + +.status__card { + padding: 15px; + border-radius: 4px; + background: $ui-base-color; + font-size: 15px; + line-height: 20px; + word-wrap: break-word; + font-weight: 400; + border: 1px solid lighten($ui-base-color, 4%); + color: $primary-text-color; + box-sizing: border-box; + min-height: 100%; + + .status__prepend { + padding: 0; + padding-bottom: 15px; + + // fixes the alignment of the reblog icon: + align-items: baseline; + } +} diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 66820f0a6e7..d09b1d5a041 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -18,7 +18,7 @@ - if status.application = status.application.name · - = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener noreferrer' do + = link_to admin_account_status_path(status.account.id, status), class: 'detailed-status__datetime' do %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) - if status.edited? · @@ -35,6 +35,9 @@ - else = fa_visibility_icon(status) = t("statuses.visibilities.#{status.visibility}") + · + = link_to ActivityPub::TagManager.instance.url_for(status), target: stream_link_target, rel: 'noopener noreferrer', class: 'detailed-status__link' do + = t('statuses.view_publicly') - if status.proper.sensitive? · = material_symbol('visibility_off') diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml index 9cadde2870c..ee7c325dc41 100644 --- a/app/views/admin/statuses/show.html.haml +++ b/app/views/admin/statuses/show.html.haml @@ -1,7 +1,14 @@ - content_for :page_title do - = t('statuses.title', name: display_name(@account), quote: truncate(@status.spoiler_text.presence || @status.text, length: 50, omission: '…', escape: false)) + = t('admin.statuses.status_title', name: display_name(@account)) - content_for :heading_actions do + = form_with model: @status_batch_action, url: batch_admin_account_statuses_path(@account.id) do |f| + = f.hidden_field :status_ids, { multiple: true, value: @status.id } + = f.button safe_join([fa_icon('flag'), t('admin.statuses.batch.report')]), + class: 'button', + data: { confirm: t('admin.reports.are_you_sure') }, + name: :report, + type: :submit = link_to t('admin.statuses.open'), ActivityPub::TagManager.instance.url_for(@status), class: 'button', target: '_blank', rel: 'noopener noreferrer' %h3= t('admin.statuses.metadata') @@ -44,7 +51,52 @@ %hr.spacer/ -%h3= t('admin.statuses.history') +%h3= t('admin.statuses.contents') -%ol.history - = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits +.status__card + - if @status.reblog? + .status__prepend + = fa_icon('retweet fw') + = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(@status.proper.account)) + .status__content>< + - if @status.proper.spoiler_text.blank? + = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis) + - else + %details< + %summary>< + %strong> Content warning: #{prerender_custom_emojis(h(@status.proper.spoiler_text), @status.proper.emojis)} + = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis) + + - unless @status.proper.ordered_media_attachments.empty? + = render partial: 'admin/reports/media_attachments', locals: { status: @status.proper } + + .detailed-status__meta + - if @status.application + = @status.application.name + · + %span.detailed-status__datetime + %time.formatted{ datetime: @status.created_at.iso8601, title: l(@status.created_at) }= l(@status.created_at) + - if @status.edited? + · + %span.detailed-status__datetime + = t('statuses.edited_at_html', date: content_tag(:time, l(@status.edited_at), datetime: @status.edited_at.iso8601, title: l(@status.edited_at), class: 'formatted')) + - if @status.discarded? + · + %span.negative-hint= t('admin.statuses.deleted') + - unless @status.reblog? + · + = fa_visibility_icon(@status) + = t("statuses.visibilities.#{@status.visibility}") + - if @status.proper.sensitive? + · + = material_symbol('visibility_off') + = t('stream_entries.sensitive_content') + +%hr.spacer/ + +%h3= t('admin.statuses.history') +- if @status.edits.empty? + %p= t('admin.statuses.no_history') +- else + %ol.history + = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits diff --git a/config/locales/en.yml b/config/locales/en.yml index 20df80c272f..a5f44652495 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -811,6 +811,7 @@ en: batch: remove_from_report: Remove from report report: Report + contents: Contents deleted: Deleted favourites: Favorites history: Version history @@ -819,11 +820,13 @@ en: media: title: Media metadata: Metadata + no_history: This post hasn't been edited no_status_selected: No posts were changed as none were selected open: Open post original_status: Original post reblogs: Reblogs status_changed: Post changed + status_title: Post by %{name} title: Account posts trending: Trending visibility: Visibility @@ -1718,6 +1721,7 @@ en: show_more: Show more show_thread: Show thread title: '%{name}: "%{quote}"' + view_publicly: View publicly visibilities: direct: Direct private: Followers-only From e3a4f591d0aa77fae1fb2a5cef1f58c312319c52 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 00:46:47 +0200 Subject: [PATCH 2/5] Improve account statuses show title --- app/views/admin/statuses/show.html.haml | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml index ee7c325dc41..bf3f8d46108 100644 --- a/app/views/admin/statuses/show.html.haml +++ b/app/views/admin/statuses/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t('admin.statuses.status_title', name: display_name(@account)) + = t('admin.statuses.status_title', name: @account.pretty_acct) - content_for :heading_actions do = form_with model: @status_batch_action, url: batch_admin_account_statuses_path(@account.id) do |f| diff --git a/config/locales/en.yml b/config/locales/en.yml index a5f44652495..aa71d6a6c91 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -826,7 +826,7 @@ en: original_status: Original post reblogs: Reblogs status_changed: Post changed - status_title: Post by %{name} + status_title: Post by @%{name} title: Account posts trending: Trending visibility: Visibility From ec212c9e3f2a026ccb166d3ad60e54e2b027a8a0 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 00:47:34 +0200 Subject: [PATCH 3/5] Improve ability to translate account statuses title --- app/views/admin/statuses/index.html.haml | 4 +--- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml index 770d972d934..9949405b400 100644 --- a/app/views/admin/statuses/index.html.haml +++ b/app/views/admin/statuses/index.html.haml @@ -1,7 +1,5 @@ - content_for :page_title do - = t('admin.statuses.title') - \- - @#{@account.pretty_acct} + = t('admin.statuses.title', name: @account.pretty_acct) .filters .filter-subset diff --git a/config/locales/en.yml b/config/locales/en.yml index aa71d6a6c91..4e760293da2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -827,7 +827,7 @@ en: reblogs: Reblogs status_changed: Post changed status_title: Post by @%{name} - title: Account posts + title: Account posts - @%{name} trending: Trending visibility: Visibility with_media: With media From a0142c71321dc4ec899cf6a0a93e214fb136d256 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 01:15:17 +0200 Subject: [PATCH 4/5] Move the view_publicly localisation to admin.statuses.view_publicly --- app/views/admin/reports/_status.html.haml | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index d09b1d5a041..fb337ba3a8f 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -37,7 +37,7 @@ = t("statuses.visibilities.#{status.visibility}") · = link_to ActivityPub::TagManager.instance.url_for(status), target: stream_link_target, rel: 'noopener noreferrer', class: 'detailed-status__link' do - = t('statuses.view_publicly') + = t('admin.statuses.view_publicly') - if status.proper.sensitive? · = material_symbol('visibility_off') diff --git a/config/locales/en.yml b/config/locales/en.yml index 4e760293da2..a5f54225042 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -830,6 +830,7 @@ en: title: Account posts - @%{name} trending: Trending visibility: Visibility + view_publicly: View publicly with_media: With media strikes: actions: @@ -1721,7 +1722,6 @@ en: show_more: Show more show_thread: Show thread title: '%{name}: "%{quote}"' - view_publicly: View publicly visibilities: direct: Direct private: Followers-only From f09a1ca5a1ab395d79d94cea9e204832db67e9f8 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Mon, 24 Jun 2024 01:30:30 +0200 Subject: [PATCH 5/5] 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 2a3d954a354..7c931c11570 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 bf3f8d46108..a61020f1de5 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 a5f54225042..7f8da89fd6b 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: