Merge 486448f0be 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/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/process_hashtags_service.rb

@@ -21,20 +21,32 @@ class ProcessHashtagsService < BaseService
   def update_featured_tags!
     return unless @status.distributable?
 
-    added_tags = @current_tags - @previous_tags
+    process_added_tags! unless added_tags.empty?
 
-    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)
-      end
-    end
+    process_removed_tags! unless removed_tags.empty?
+  end
 
-    removed_tags = @previous_tags - @current_tags
-
-    unless removed_tags.empty?
-      @account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
-        featured_tag.decrement(@status)
-      end
+  def process_added_tags!
+    featured_tags_on(added_tags).find_each do |featured_tag|
+      featured_tag.increment(@status.created_at)
     end
   end
+
+  def process_removed_tags!
+    featured_tags_on(removed_tags).find_each do |featured_tag|
+      featured_tag.decrement(@status)
+    end
+  end
+
+  def featured_tags_on(tags)
+    @account.featured_tags.where(tag_id: tags.map(&:id))
+  end
+
+  def added_tags
+    @current_tags - @previous_tags
+  end
+
+  def removed_tags
+    @previous_tags - @current_tags
+  end
 end

spec/services/process_hashtags_service_spec.rb

@@ -4,13 +4,40 @@ require 'rails_helper'
 
 RSpec.describe ProcessHashtagsService do
   describe '#call' do
-    let(:status) { Fabricate(:status, visibility: :public, text: 'With tags #one #two') }
+    let!(:prior_tag) { Fabricate :tag, name: 'priortag' }
+    let!(:featured_tag) { Fabricate :featured_tag, account: status.account, tag: prior_tag }
 
-    it 'applies the tags from the status text' do
-      expect { subject.call(status) }
-        .to change(Tag, :count).by(2)
-      expect(status.reload.tags.map(&:name))
-        .to contain_exactly('one', 'two')
+    context 'when status is distributable' do
+      let(:status) { Fabricate(:status, visibility: :public, text: 'With tags #one #two', tags: [prior_tag]) }
+
+      it 'applies the tags from the status text and removes previous unused tags' do
+        expect { subject.call(status) }
+          .to change(Tag, :count).by(2)
+          .and change { status.reload.tags.map(&:name) }.from(contain_exactly('priortag')).to(contain_exactly('one', 'two'))
+          .and change { featured_tag.reload.statuses_count }.by(-1)
+      end
+    end
+
+    context 'when status is not distributable' do
+      let(:status) { Fabricate(:status, visibility: :private, text: 'With tags #one #two', tags: [prior_tag]) }
+
+      it 'applies the tags but does not modify featured tags' do
+        expect { subject.call(status) }
+          .to change(Tag, :count).by(2)
+          .and change { status.reload.tags.map(&:name) }.from(contain_exactly('priortag')).to(contain_exactly('one', 'two'))
+          .and(not_change { featured_tag.reload.statuses_count })
+      end
+    end
+
+    context 'when tags do not change' do
+      let(:status) { Fabricate(:status, visibility: :public, text: 'With tags #priortag', tags: [prior_tag]) }
+
+      it 'does not modify tags or featured tags' do
+        expect { subject.call(status) }
+          .to not_change(Tag, :count)
+          .and not_change { status.reload.tags.map(&:name) }.from(contain_exactly('priortag'))
+          .and(not_change { featured_tag.reload.statuses_count })
+      end
     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