Merge e4611e47b1 into 14cb5ff881

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

app/controllers/admin/email_domain_blocks_controller.rb

@@ -33,17 +33,7 @@ module Admin
       @email_domain_block = EmailDomainBlock.new(resource_params)
 
       if action_from_button == 'save'
-        EmailDomainBlock.transaction do
-          @email_domain_block.save!
-          log_action :create, @email_domain_block
-
-          (@email_domain_block.other_domains || []).uniq.each do |domain|
-            next if EmailDomainBlock.exists?(domain: domain)
-
-            other_email_domain_block = EmailDomainBlock.create!(domain: domain, allow_with_approval: @email_domain_block.allow_with_approval, parent: @email_domain_block)
-            log_action :create, other_email_domain_block
-          end
-        end
+        process_email_domain_block
 
         redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg')
       else
@@ -57,6 +47,37 @@ module Admin
 
     private
 
+    def process_email_domain_block
+      EmailDomainBlock.transaction do
+        @email_domain_block.save!
+        log_action :create, @email_domain_block
+        save_other_domains
+      end
+    end
+
+    def save_other_domains
+      other_domains_from_block.each do |domain|
+        next if EmailDomainBlock.exists?(domain: domain)
+
+        log_action :create, block_child_domain(domain)
+      end
+    end
+
+    def block_child_domain(domain)
+      EmailDomainBlock.create!(
+        allow_with_approval: @email_domain_block.allow_with_approval,
+        domain: domain,
+        parent: @email_domain_block
+      )
+    end
+
+    def other_domains_from_block
+      @email_domain_block
+        .other_domains
+        .to_a
+        .uniq
+    end
+
     def set_resolved_records
       @resolved_records = DomainResource.new(@email_domain_block.domain).mx
     end

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
 

spec/system/admin/email_domain_blocks_spec.rb

@@ -8,7 +8,13 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
   before { sign_in current_user }
 
   describe 'Managing email domain blocks' do
-    before { configure_dns(domain: 'example.com', results: []) }
+    before do
+      Fabricate :email_domain_block, domain: 'tester.example'
+      allow(DomainResource)
+        .to receive(:new)
+        .with('example.com')
+        .and_return(instance_double(DomainResource, mx: ['test.example', 'tester.example']))
+    end
 
     let!(:email_domain_block) { Fabricate :email_domain_block }
 
@@ -28,8 +34,12 @@ RSpec.describe 'Admin::EmailDomainBlocks' do
       expect(page)
         .to have_content(I18n.t('admin.email_domain_blocks.new.title'))
 
+      find('input[checked_value="test.example"]').click
+      find('input[checked_value="tester.example"]').click
       expect { submit_create }
         .to change(EmailDomainBlock.where(domain: 'example.com'), :count).by(1)
+        .and change(EmailDomainBlock.where.associated(:parent).where(domain: 'test.example'), :count).by(1)
+        .and not_change(EmailDomainBlock.where.associated(:parent).where(domain: 'tester.example'), :count)
       expect(page)
         .to have_content(I18n.t('admin.email_domain_blocks.title'))
         .and have_content(I18n.t('admin.email_domain_blocks.created_msg'))

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