Merge f0eece5bdf 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/lib/activitypub/activity/create.rb

@@ -179,7 +179,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     return if @tags.empty? || !status.distributable?
 
     @account.featured_tags.where(tag_id: @tags.pluck(:id)).find_each do |featured_tag|
-      featured_tag.increment(status.created_at)
+      featured_tag.increment_count(status.created_at)
     end
   end
 

app/models/featured_tag.rb

@@ -42,11 +42,11 @@ class FeaturedTag < ApplicationRecord
     attributes['name'] || tag.display_name
   end
 
-  def increment(timestamp)
+  def increment_count(timestamp)
     update(statuses_count: statuses_count + 1, last_status_at: timestamp)
   end
 
-  def decrement(deleted_status)
+  def decrement_count(deleted_status)
     if statuses_count <= 1
       update(statuses_count: 0, last_status_at: nil)
     elsif last_status_at.present? && last_status_at > deleted_status.created_at

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/services/activitypub/process_status_update_service.rb

@@ -208,7 +208,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
     unless added_tags.empty?
       @account.featured_tags.where(tag_id: added_tags.pluck(:id)).find_each do |featured_tag|
-        featured_tag.increment(@status.created_at)
+        featured_tag.increment_count(@status.created_at)
       end
     end
 
@@ -216,7 +216,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
     unless removed_tags.empty?
       @account.featured_tags.where(tag_id: removed_tags.pluck(:id)).find_each do |featured_tag|
-        featured_tag.decrement(@status)
+        featured_tag.decrement_count(@status)
       end
     end
   end

app/services/process_hashtags_service.rb

@@ -25,7 +25,7 @@ class ProcessHashtagsService < BaseService
 
     unless added_tags.empty?
       @account.featured_tags.where(tag_id: added_tags.map(&:id)).find_each do |featured_tag|
-        featured_tag.increment(@status.created_at)
+        featured_tag.increment_count(@status.created_at)
       end
     end
 
@@ -33,7 +33,7 @@ class ProcessHashtagsService < BaseService
 
     unless removed_tags.empty?
       @account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
-        featured_tag.decrement(@status)
+        featured_tag.decrement_count(@status)
       end
     end
   end

app/services/remove_status_service.rb

@@ -118,7 +118,7 @@ class RemoveStatusService < BaseService
 
   def remove_from_hashtags
     @account.featured_tags.where(tag_id: @status.tags.map(&:id)).find_each do |featured_tag|
-      featured_tag.decrement(@status)
+      featured_tag.decrement_count(@status)
     end
 
     return unless @status.public_visibility?

spec/models/featured_tag_spec.rb

@@ -114,18 +114,18 @@ RSpec.describe FeaturedTag do
     end
   end
 
-  describe '#increment' do
+  describe '#increment_count' do
     it 'increases the count and updates the last_status_at timestamp' do
       featured_tag = Fabricate :featured_tag
       timestamp = 5.days.ago
 
-      expect { featured_tag.increment(timestamp) }
+      expect { featured_tag.increment_count(timestamp) }
         .to change(featured_tag, :statuses_count).from(0).to(1)
         .and change(featured_tag, :last_status_at).from(nil).to(be_within(0.1).of(timestamp))
     end
   end
 
-  describe '#decrement' do
+  describe '#decrement_count' do
     let(:tag) { Fabricate(:tag, name: 'test') }
     let(:account) { Fabricate(:account) }
     let(:featured_tag) { Fabricate(:featured_tag, name: 'test', account: account) }
@@ -138,7 +138,7 @@ RSpec.describe FeaturedTag do
       end
 
       it 'decreases the count and updates the last_status_at timestamp' do
-        expect { featured_tag.decrement(status) }
+        expect { featured_tag.decrement_count(status) }
           .to change(featured_tag, :statuses_count).from(1).to(0)
           .and change(featured_tag, :last_status_at).to(nil)
       end
@@ -154,7 +154,7 @@ RSpec.describe FeaturedTag do
       end
 
       it 'decreases the count and updates the last_status_at timestamp' do
-        expect { featured_tag.decrement(previous_status) }
+        expect { featured_tag.decrement_count(previous_status) }
           .to change(featured_tag, :statuses_count).from(2).to(1)
           .and not_change(featured_tag, :last_status_at)
       end
@@ -170,7 +170,7 @@ RSpec.describe FeaturedTag do
       end
 
       it 'decreases the count and updates the last_status_at timestamp' do
-        expect { featured_tag.decrement(status) }
+        expect { featured_tag.decrement_count(status) }
           .to change(featured_tag, :statuses_count).from(2).to(1)
           .and change(featured_tag, :last_status_at)
       end

spec/serializers/rest/featured_tag_serializer_spec.rb

@@ -13,9 +13,7 @@ RSpec.describe REST::FeaturedTagSerializer do
   let(:featured_tag) { Fabricate :featured_tag }
 
   context 'when last_status_at is populated' do
-    before do
+    before { featured_tag.update last_status_at: DateTime.new(2024, 11, 28, 16, 20, 0) }
-      featured_tag.increment(DateTime.new(2024, 11, 28, 16, 20, 0))
-    end
 
     it 'is serialized as yyyy-mm-dd' do
       expect(subject['last_status_at']).to eq('2024-11-28')

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