Merge 7a37ea6c98 into 14cb5ff881

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

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/announcement.rb

@@ -24,8 +24,10 @@ class Announcement < ApplicationRecord
   scope :chronological, -> { order(coalesced_chronology_timestamps.asc) }
   scope :reverse_chronological, -> { order(coalesced_chronology_timestamps.desc) }
 
-  has_many :announcement_mutes, dependent: :destroy
+  with_options dependent: :destroy, inverse_of: :announcement do
-  has_many :announcement_reactions, dependent: :destroy
+    has_many :announcement_mutes
+    has_many :announcement_reactions
+  end
 
   validates :text, presence: true
   validates :starts_at, presence: true, if: :ends_at?

app/models/announcement_mute.rb

@@ -12,8 +12,10 @@
 #
 
 class AnnouncementMute < ApplicationRecord
-  belongs_to :account
+  with_options inverse_of: :announcement_mutes do
-  belongs_to :announcement, inverse_of: :announcement_mutes
+    belongs_to :account
+    belongs_to :announcement
+  end
 
   validates :account_id, uniqueness: { scope: :announcement_id }
 end

app/models/announcement_reaction.rb

@@ -17,8 +17,11 @@ class AnnouncementReaction < ApplicationRecord
   before_validation :set_custom_emoji, if: :name?
   after_commit :queue_publish
 
-  belongs_to :account
+  with_options inverse_of: :announcement_reactions do
-  belongs_to :announcement, inverse_of: :announcement_reactions
+    belongs_to :account
+    belongs_to :announcement
+  end
+
   belongs_to :custom_emoji, optional: true
 
   validates :name, presence: true

app/models/concerns/account/associations.rb

@@ -12,6 +12,8 @@ module Account::Associations
         has_many :account_pins
         has_many :account_warnings
         has_many :aliases, class_name: 'AccountAlias'
+        has_many :announcement_mutes
+        has_many :announcement_reactions
         has_many :bookmarks
         has_many :conversations, class_name: 'AccountConversation'
         has_many :custom_filters

app/models/concerns/account/interactions.rb

@@ -43,7 +43,6 @@ module Account::Interactions
     has_many :muted_by, -> { order(mutes: { id: :desc }) }, through: :muted_by_relationships, source: :account
     has_many :conversation_mutes, dependent: :destroy
     has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy
-    has_many :announcement_mutes, dependent: :destroy
   end
 
   def follow!(other_account, reblogs: nil, notify: nil, languages: nil, uri: nil, rate_limit: false, bypass_limit: false)

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/models/announcement_mute_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnouncementMute do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:account).inverse_of(:announcement_mutes) }
+    it { is_expected.to belong_to(:announcement).inverse_of(:announcement_mutes) }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :announcement_mute }
+
+    it { is_expected.to validate_uniqueness_of(:account_id).scoped_to(:announcement_id) }
+  end
+end

spec/models/announcement_reaction_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe AnnouncementReaction do
   describe 'Associations' do
-    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:account).inverse_of(:announcement_reactions) }
     it { is_expected.to belong_to(:announcement).inverse_of(:announcement_reactions) }
     it { is_expected.to belong_to(:custom_emoji).optional }
   end

spec/models/announcement_spec.rb

@@ -3,6 +3,11 @@
 require 'rails_helper'
 
 RSpec.describe Announcement do
+  describe 'Associations' do
+    it { is_expected.to have_many(:announcement_mutes).inverse_of(:announcement).dependent(:destroy) }
+    it { is_expected.to have_many(:announcement_reactions).inverse_of(:announcement).dependent(:destroy) }
+  end
+
   describe 'Scopes' do
     context 'with published and unpublished records' do
       let!(:published) { Fabricate(:announcement, published: true) }

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