Merge 50961e32e0 into 14cb5ff881

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

app/controllers/admin/reports/actions_controller.rb

@@ -6,6 +6,7 @@ class Admin::Reports::ActionsController < Admin::BaseController
   def preview
     authorize @report, :show?
     @moderation_action = action_from_button
+    @statuses = @report.statuses.includes(:application, :media_attachments)
   end
 
   def create

app/javascript/mastodon/components/button/button.stories.tsx

@@ -8,6 +8,7 @@ const meta = {
   component: Button,
   args: {
     secondary: false,
+    plain: false,
     compact: false,
     dangerous: false,
     disabled: false,
@@ -57,6 +58,14 @@ export const Secondary: Story = {
   play: buttonTest,
 };
 
+export const Plain: Story = {
+  args: {
+    plain: true,
+    children: 'Plain button',
+  },
+  play: buttonTest,
+};
+
 export const Compact: Story = {
   args: {
     compact: true,
@@ -101,6 +110,14 @@ export const SecondaryDisabled: Story = {
   play: disabledButtonTest,
 };
 
+export const PlainDisabled: Story = {
+  args: {
+    ...Plain.args,
+    disabled: true,
+  },
+  play: disabledButtonTest,
+};
+
 const loadingButtonTest: Story['play'] = async ({
   args,
   canvas,

app/javascript/mastodon/components/button/index.tsx

@@ -9,6 +9,7 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
+  plain?: boolean;
   compact?: boolean;
   dangerous?: boolean;
   loading?: boolean;
@@ -35,6 +36,7 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
+  plain,
   compact,
   dangerous,
   loading,
@@ -62,6 +64,7 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
+        'button--plain': plain,
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,

app/javascript/styles/mastodon/components.scss

@@ -201,6 +201,41 @@
     }
   }
 
+  &.button--plain {
+    color: $highlight-text-color;
+    background: transparent;
+    padding: 6px;
+
+    // The button has no outline, so we use negative margin to
+    // visually align its label with its surroundings while maintaining
+    // a generous click target
+    margin-inline: -6px;
+    border: 1px solid transparent;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: transparent;
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
+      text-decoration: none;
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: transparent;
+      color: $ui-button-disabled-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: transparent;
+        color: $ui-button-disabled-color;
+      }
+    }
+  }
+
   &.button-tertiary {
     background: transparent;
     padding: 6px 17px;

app/models/report.rb

@@ -79,6 +79,10 @@ class Report < ApplicationRecord
     Status.with_discarded.where(id: status_ids)
   end
 
+  def deleted_status_ids
+    status_ids.difference(statuses.pluck(:id))
+  end
+
   def media_attachments_count
     statuses_to_query = []
     count = 0

app/serializers/activitypub/note_serializer.rb

@@ -232,6 +232,15 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
       canQuote: {
         automaticApproval: approved_uris,
       },
+      canReply: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canLike: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canAnnounce: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
     }
   end
 

app/views/admin/reports/actions/_deleted_status.html.haml

@@ -0,0 +1,4 @@
+.strike-card__statuses-list__item
+  .one-liner= t('disputes.strikes.status', id: status_id)
+  .strike-card__statuses-list__item__meta
+    = t('disputes.strikes.status_removed')

app/views/admin/reports/actions/_status.html.haml

@@ -0,0 +1,13 @@
+.strike-card__statuses-list__item
+  .one-liner
+    .emojify= one_line_preview(status)
+    - status.ordered_media_attachments.each do |media|
+      %abbr{ title: media.description }
+        = material_symbol 'link'
+        = media.file_file_name
+  .strike-card__statuses-list__item__meta
+    = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener' do
+      %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+    - if status.application.present?
+      ·
+      = status.application.name

app/views/admin/reports/actions/preview.html.haml

@@ -50,28 +50,8 @@
           %strong= t('user_mailer.warning.statuses')
 
         .strike-card__statuses-list
-          - status_map = @report.statuses.includes(:application, :media_attachments).index_by(&:id)
+          = render partial: 'status', collection: @statuses
-
+          = render partial: 'deleted_status', collection: @report.deleted_status_ids, as: :status_id
-          - @report.status_ids.each do |status_id|
-            .strike-card__statuses-list__item
-              - if (status = status_map[status_id.to_i])
-                .one-liner
-                  .emojify= one_line_preview(status)
-
-                  - status.ordered_media_attachments.each do |media_attachment|
-                    %abbr{ title: media_attachment.description }
-                      = material_symbol 'link'
-                      = media_attachment.file_file_name
-                .strike-card__statuses-list__item__meta
-                  = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener' do
-                    %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
-                  - unless status.application.nil?
-                    ·
-                    = status.application.name
-              - else
-                .one-liner= t('disputes.strikes.status', id: status_id)
-                .strike-card__statuses-list__item__meta
-                  = t('disputes.strikes.status_removed')
 
     %hr.spacer/
 

spec/models/report_spec.rb

@@ -13,6 +13,17 @@ RSpec.describe Report do
     end
   end
 
+  describe '#deleted_status_ids' do
+    let!(:status) { Fabricate :status }
+    let(:report) { Fabricate.build :report, status_ids: [deleted, status.id] }
+    let(:deleted) { 123_123_123 }
+
+    it 'returns ids of stored statuses which no longer exist' do
+      expect(report.deleted_status_ids)
+        .to contain_exactly(deleted)
+    end
+  end
+
   describe 'media_attachments_count' do
     it 'returns count of media attachments in statuses' do
       status1 = Fabricate(:status, ordered_media_attachment_ids: [1, 2])

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
+  version: 1.92.0
-  resolution: "sass@npm:1.91.0"
+  resolution: "sass@npm:1.92.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -11969,7 +11969,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/5be1c98f7a618cb5f90b62f63d2aa0f78f9bf369c93ec7cd9880752a26b0ead19aa63cc341e8a26ce6c74d080baa5705f1685dff52fe6a3f28a7828ae50182b6
+  checksum: 10c0/bdff9fa6988620e2a81962efdd016e3894d19934cfadc105cf41db767f59dd47afd8ff32840e612ef700cb67e19d9e83c108f1724eb8f0bef56c4877dbe6f14d
   languageName: node
   linkType: hard