Merge 80108280ff into 6d62581da1

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

app/javascript/styles/mastodon/admin.scss

@@ -292,6 +292,10 @@ $content-width: 840px;
       padding-bottom: 8px;
       margin-bottom: 8px;
       border-bottom: 1px solid var(--background-border-color);
+
+      &.no-border {
+        border-bottom: none;
+      }
     }
 
     h6 {
@@ -900,6 +904,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;
@@ -923,6 +936,11 @@ a.name-tag,
         &__icon {
           margin-inline-end: 4px;
           font-weight: 500;
+
+          .name-tag {
+            color: inherit;
+            margin-inline-start: 4px;
+          }
         }
       }
 

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.no-border Reports grouped by reported account
+
 - @reports.group_by(&:target_account_id).each_value do |reports|
   - target_account = reports.first.target_account
   .report-card
@@ -50,15 +52,22 @@
       - 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 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')
+              .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')
@@ -67,14 +76,29 @@
               %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') }
                 = material_symbol('photo_camera')
                 = report.media_attachments_count
-
-              - if report.forwarded?
-                ·
-                = t('admin.reports.forwarded_to', domain: target_account.domain)
+              %span.report-card__summary__item__content__icon
+                - if report.account.instance_actor?
+                  = material_symbol('cloud')
+                  = site_hostname
+                - elsif report.account.local?
+                  .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
 
           .report-card__summary__item__assigned
+            %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
-              \-
+              = t 'admin.reports.unassigned'
 = paginate @reports

config/locales/en.yml

@@ -626,7 +626,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}