Merge ea734de4d8 into 14cb5ff881

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

app/helpers/statuses_helper.rb

@@ -14,47 +14,8 @@ module StatusesHelper
     end
   end
 
-  def media_summary(status)
-    attachments = { image: 0, video: 0, audio: 0 }
-
-    status.ordered_media_attachments.each do |media|
-      if media.video?
-        attachments[:video] += 1
-      elsif media.audio?
-        attachments[:audio] += 1
-      else
-        attachments[:image] += 1
-      end
-    end
-
-    text = attachments.to_a.reject { |_, value| value.zero? }.map { |key, value| I18n.t("statuses.attached.#{key}", count: value) }.join(' · ')
-
-    return if text.blank?
-
-    I18n.t('statuses.attached.description', attached: text)
-  end
-
-  def status_text_summary(status)
-    return if status.spoiler_text.blank?
-
-    I18n.t('statuses.content_warning', warning: status.spoiler_text)
-  end
-
-  def poll_summary(status)
-    return unless status.preloadable_poll
-
-    status.preloadable_poll.options.map { |o| "[ ] #{o}" }.join("\n")
-  end
-
   def status_description(status)
-    components = [[media_summary(status), status_text_summary(status)].compact_blank.join(' · ')]
-
-    if status.spoiler_text.blank?
-      components << status.text
-      components << poll_summary(status)
-    end
-
-    components.compact_blank.join("\n\n")
+    StatusDescriptionPresenter.new(status).description
   end
 
   def visibility_icon(status)

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/presenters/status_description_presenter.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+class StatusDescriptionPresenter
+  JOIN = ' · '
+
+  attr_reader :status
+
+  def initialize(status)
+    @status = status
+  end
+
+  def description
+    relevant_components
+      .compact_blank
+      .join("\n\n")
+  end
+
+  private
+
+  def relevant_components
+    [default_description].tap do |components|
+      unless status.spoiler_text?
+        components << status.text
+        components << poll_summary
+      end
+    end
+  end
+
+  def default_description
+    [media_summary, spoiler_warning]
+      .compact_blank
+      .join(JOIN)
+  end
+
+  def media_summary
+    return if media_attachment_text.blank?
+
+    I18n.t('statuses.attached.description', attached: media_attachment_text)
+  end
+
+  def media_attachment_text
+    media_attachment_counts
+      .reject { |_, value| value.zero? }
+      .map { |key, value| I18n.t("statuses.attached.#{key}", count: value) }
+      .join(JOIN)
+  end
+
+  def media_attachment_counts
+    media_initial_counts.tap do |attachments|
+      status.ordered_media_attachments.each do |media|
+        attachments[media_type(media)] += 1
+      end
+    end
+  end
+
+  def media_initial_counts
+    %i(image video audio).index_with(0)
+  end
+
+  def media_type(media)
+    if media.video?
+      :video
+    elsif media.audio?
+      :audio
+    else
+      :image
+    end
+  end
+
+  def spoiler_warning
+    return unless status.spoiler_text?
+
+    I18n.t('statuses.content_warning', warning: status.spoiler_text)
+  end
+
+  def poll_summary
+    return unless status.preloadable_poll
+
+    status
+      .preloadable_poll
+      .options
+      .map { |option| checkbox(option) }
+      .join("\n")
+  end
+
+  def checkbox(option)
+    ['[ ]', option].join(' ')
+  end
+end

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
 

spec/helpers/statuses_helper_spec.rb

@@ -3,39 +3,6 @@
 require 'rails_helper'
 
 RSpec.describe StatusesHelper do
-  describe 'status_text_summary' do
-    context 'with blank text' do
-      let(:status) { Status.new(spoiler_text: '') }
-
-      it 'returns immediately with nil' do
-        result = helper.status_text_summary(status)
-        expect(result).to be_nil
-      end
-    end
-
-    context 'with present text' do
-      let(:status) { Status.new(spoiler_text: 'SPOILERS!!!') }
-
-      it 'returns the content warning' do
-        result = helper.status_text_summary(status)
-        expect(result).to eq(I18n.t('statuses.content_warning', warning: 'SPOILERS!!!'))
-      end
-    end
-  end
-
-  describe '#media_summary' do
-    it 'describes the media on a status' do
-      status = Fabricate :status
-      Fabricate :media_attachment, status: status, type: :video
-      Fabricate :media_attachment, status: status, type: :audio
-      Fabricate :media_attachment, status: status, type: :image
-
-      result = helper.media_summary(status)
-
-      expect(result).to eq('Attached: 1 image · 1 video · 1 audio')
-    end
-  end
-
   describe 'visibility_icon' do
     context 'with a status that is public' do
       let(:status) { Status.new(visibility: 'public') }

spec/presenters/status_description_presenter_spec.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe StatusDescriptionPresenter do
+  describe '#description' do
+    subject { described_class.new(status).description }
+
+    context 'when status has blank text' do
+      let(:status) { Fabricate.build :status, text: '' }
+
+      it { is_expected.to be_blank }
+    end
+
+    context 'when status has text' do
+      let(:status) { Fabricate.build :status, text: 'Hello there' }
+
+      it { is_expected.to eq('Hello there') }
+    end
+
+    context 'when status has spoilers' do
+      let(:status) { Fabricate.build :status, text: 'Hello there', spoiler_text: 'SPOILERS!!!' }
+
+      it { is_expected.to eq(I18n.t('statuses.content_warning', warning: 'SPOILERS!!!')) }
+    end
+
+    context 'when status has media attachments' do
+      let(:status) { Fabricate.build :status, text: 'Hello there' }
+
+      before do
+        Fabricate :media_attachment, status:, type: :video
+        Fabricate.times 2, :media_attachment, status:, type: :audio
+        Fabricate :media_attachment, status:, type: :image
+      end
+
+      it { is_expected.to eq("Attached: 1 image · 1 video · 2 audio\n\nHello there") }
+    end
+
+    context 'when status has a poll' do
+      let(:preloadable_poll) { Fabricate.build(:poll, options: %w(One Two)) }
+      let(:status) { Fabricate.build :status, text: 'Hello there', preloadable_poll: }
+
+      it { is_expected.to eq("Hello there\n\n[ ] One\n[ ] Two") }
+    end
+  end
+end

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
-  resolution: "sass@npm:1.91.0"
+  version: 1.92.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