From 3f330d95b145e3c2f3dd17ab96b687db5f3fb3ef Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 22 Aug 2024 21:15:14 +0200 Subject: [PATCH 1/3] WIP --- app/javascript/styles/mastodon/admin.scss | 9 ++++++++ app/views/admin/reports/index.html.haml | 25 +++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 120bad27ed..5319eaca94 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -906,6 +906,15 @@ a.name-tag, justify-content: flex-start; border-top: 1px solid var(--background-border-color); + &__report-id { + text-decoration: none; + color: $darker-text-color; + + &:hover { + color: $highlight-text-color; + } + } + &__reported-by, &__assigned { padding: 15px; diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index b476c6ccfa..4f7918fb6a 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -30,6 +30,8 @@ %button.button= t('admin.accounts.search') = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative' +%h4 Reports by reported account + - @reports.group_by(&:target_account_id).each_value do |reports| - target_account = reports.first.target_account .report-card @@ -50,12 +52,9 @@ - reports.each do |report| .report-card__summary__item .report-card__summary__item__reported-by - - if report.account.instance_actor? - = site_hostname - - elsif report.account.local? - = admin_account_link_to report.account - - else - = report.account.domain + = link_to t('admin.reports.report', id: report.id), admin_report_path(report), class: 'report-card__summary__item__report-id' + %br + .report-card__summary__item__content = link_to admin_report_path(report) do .one-line= report.comment.presence || t('admin.reports.comment.none') @@ -68,11 +67,25 @@ = material_symbol('photo_camera') = report.media_attachments_count + %span.report-card__summary__item__content__icon{ title: } + - if report.account.instance_actor? + = material_symbol('cloud') + = site_hostname + - elsif report.account.local? + = material_symbol('person') + = report.account.acct + - else + = material_symbol('cloud') + = report.account.domain + - if report.forwarded? · = t('admin.reports.forwarded_to', domain: target_account.domain) .report-card__summary__item__assigned + %span.report-card__summary__item__content__icon{ title: t('admin.reports.notes.title') } + = material_symbol('comment') + = report.notes.count - if report.assigned_account.present? = admin_account_link_to report.assigned_account - else From 79b553503e98b0a4d432a22523383e8e757a2c3f Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 22 Aug 2024 21:25:36 +0200 Subject: [PATCH 2/3] WIP --- app/views/admin/reports/index.html.haml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 4f7918fb6a..60ec6b8464 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -52,12 +52,8 @@ - reports.each do |report| .report-card__summary__item .report-card__summary__item__reported-by - = link_to t('admin.reports.report', id: report.id), admin_report_path(report), class: 'report-card__summary__item__report-id' - %br - - .report-card__summary__item__content - = link_to admin_report_path(report) do - .one-line= report.comment.presence || t('admin.reports.comment.none') + = link_to admin_report_path(report), class: 'report-card__summary__item__report-id' do + .one-line= t('admin.reports.report', id: report.id) %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') } = material_symbol('comment') @@ -67,6 +63,11 @@ = material_symbol('photo_camera') = report.media_attachments_count + .report-card__summary__item__content + = link_to admin_report_path(report) do + .one-line= report.comment.presence || t('admin.reports.comment.none') + + %span.report-card__summary__item__content__icon{ title: } - if report.account.instance_actor? = material_symbol('cloud') @@ -86,8 +87,10 @@ %span.report-card__summary__item__content__icon{ title: t('admin.reports.notes.title') } = material_symbol('comment') = report.notes.count + = t('admin.reports.notes.title') + %br - if report.assigned_account.present? = admin_account_link_to report.assigned_account - else - \- + unassigned = paginate @reports From 80108280ffcb9b48684fa46f1cd87d71778f3826 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 22 Aug 2024 22:44:37 +0200 Subject: [PATCH 3/3] WIP --- .../admin/account_moderation_notes_helper.rb | 4 +- app/javascript/styles/mastodon/admin.scss | 9 +++++ app/views/admin/reports/index.html.haml | 38 +++++++++++-------- config/locales/en.yml | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 2a3d954a35..bd55f1ae1f 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -23,8 +23,6 @@ module Admin::AccountModerationNotesHelper ) end - private - def labeled_account_avatar(account) safe_join( [ @@ -35,6 +33,8 @@ module Admin::AccountModerationNotesHelper ) end + private + def account_inline_text(account) content_tag(:span, account.acct, class: 'username') end diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 5319eaca94..32d0c82bca 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -288,6 +288,10 @@ $content-width: 840px; padding-bottom: 8px; margin-bottom: 8px; border-bottom: 1px solid var(--background-border-color); + + &.no-border { + border-bottom: none; + } } h6 { @@ -938,6 +942,11 @@ a.name-tag, &__icon { margin-inline-end: 4px; font-weight: 500; + + .name-tag { + color: inherit; + margin-inline-start: 4px; + } } } diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 60ec6b8464..6b3cad2cbe 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -30,7 +30,7 @@ %button.button= t('admin.accounts.search') = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative' -%h4 Reports by reported account +%h4.no-border Reports grouped by reported account - @reports.group_by(&:target_account_id).each_value do |reports| - target_account = reports.first.target_account @@ -54,6 +54,20 @@ .report-card__summary__item__reported-by = link_to admin_report_path(report), class: 'report-card__summary__item__report-id' do .one-line= t('admin.reports.report', id: report.id) + - case report.category + - when 'legal' + Illegal + - when 'spam' + Spam + - when 'violation' + Rule Violation + - else + Other + + .report-card__summary__item__content + = link_to admin_report_path(report) do + .one-line + = report.comment.presence || t('admin.reports.comment.none') %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') } = material_symbol('comment') @@ -62,27 +76,21 @@ %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') } = material_symbol('photo_camera') = report.media_attachments_count - - .report-card__summary__item__content - = link_to admin_report_path(report) do - .one-line= report.comment.presence || t('admin.reports.comment.none') - - - %span.report-card__summary__item__content__icon{ title: } + %span.report-card__summary__item__content__icon - if report.account.instance_actor? = material_symbol('cloud') = site_hostname - elsif report.account.local? - = material_symbol('person') - = report.account.acct + .name-tag= labeled_account_avatar report.account + -# = material_symbol('person') + = report.account.acct + - if report.forwarded? + • + = t('admin.reports.forwarded') - else = material_symbol('cloud') = report.account.domain - - if report.forwarded? - · - = t('admin.reports.forwarded_to', domain: target_account.domain) - .report-card__summary__item__assigned %span.report-card__summary__item__content__icon{ title: t('admin.reports.notes.title') } = material_symbol('comment') @@ -92,5 +100,5 @@ - if report.assigned_account.present? = admin_account_link_to report.assigned_account - else - unassigned + = t 'admin.reports.unassigned' = paginate @reports diff --git a/config/locales/en.yml b/config/locales/en.yml index 99dcb657f4..4b79e20637 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -614,7 +614,7 @@ en: category: Category category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account comment: - none: None + none: No Comment comment_description_html: 'To provide more information, %{name} wrote:' confirm: Confirm confirm_action: Confirm moderation action against @%{acct}