Merge ef0e88fde6 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/concerns/account/attribution_domains.rb

@@ -12,8 +12,7 @@ module Account::AttributionDomains
   end
 
   def can_be_attributed_from?(domain)
-    segments = domain.split('.')
-    variants = segments.map.with_index { |_, i| segments[i..].join('.') }.to_set
-    self[:attribution_domains].to_set.intersect?(variants)
+    variants = self.class.domain_variants(domain)
+    self[:attribution_domains].to_set.intersect?(variants.to_set)
   end
 end

app/models/concerns/domain_normalizable.rb

@@ -17,6 +17,11 @@ module DomainNormalizable
         SQL
       )
     end
+
+    def domain_variants(domain)
+      segments = domain.to_s.split('.')
+      Array.new(segments.size) { |i| segments[i..].join('.') }
+    end
   end
 
   private

app/models/domain_allow.rb

@@ -33,7 +33,7 @@ class DomainAllow < ApplicationRecord
     def rule_for(domain)
       return if domain.blank?
 
-      uri = Addressable::URI.new.tap { |u| u.host = domain.delete('/') }
+      uri = Addressable::URI.new.tap { |u| u.host = domain.strip.delete('/') }
 
       find_by(domain: uri.normalized_host)
     end

app/models/domain_block.rb

@@ -68,11 +68,8 @@ class DomainBlock < ApplicationRecord
     def rule_for(domain)
       return if domain.blank?
 
-      uri      = Addressable::URI.new.tap { |u| u.host = domain.strip.delete('/') }
-      segments = uri.normalized_host.split('.')
-      variants = segments.map.with_index { |_, i| segments[i..].join('.') }
-
-      where(domain: variants).by_domain_length.first
+      uri = Addressable::URI.new.tap { |u| u.host = domain.strip.delete('/') }
+      where(domain: domain_variants(uri.normalized_host)).by_domain_length.first
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
       nil
     end

app/models/email_domain_block.rb

@@ -64,13 +64,7 @@ class EmailDomainBlock < ApplicationRecord
     end
 
     def domains_with_variants
-      @uris.flat_map do |uri|
-        next if uri.nil?
-
-        segments = uri.normalized_host.split('.')
-
-        segments.map.with_index { |_, i| segments[i..].join('.') }
-      end
+      @uris.compact.flat_map { |uri| EmailDomainBlock.domain_variants(uri.normalized_host) }.uniq
     end
 
     def extract_uris(domain_or_domains)

app/models/preview_card_provider.rb

@@ -36,7 +36,6 @@ class PreviewCardProvider < ApplicationRecord
   scope :not_trendable, -> { where(trendable: false) }
 
   def self.matching_domain(domain)
-    segments = domain.split('.')
-    where(domain: segments.map.with_index { |_, i| segments[i..].join('.') }).by_domain_length.first
+    where(domain: domain_variants(domain)).by_domain_length.first
   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/models/domain_allow_spec.rb

@@ -12,4 +12,27 @@ RSpec.describe DomainAllow do
       it { is_expected.to_not allow_value('xn--r9j5b5b').for(:domain) }
     end
   end
+
+  describe '.rule_for' do
+    subject { described_class.rule_for(domain) }
+
+    let(:domain) { 'host.example' }
+
+    context 'with no records' do
+      it { is_expected.to be_nil }
+    end
+
+    context 'with matching record' do
+      let!(:domain_allow) { Fabricate :domain_allow, domain: }
+
+      it { is_expected.to eq(domain_allow) }
+    end
+
+    context 'when called with non normalized string' do
+      let!(:domain_allow) { Fabricate :domain_allow, domain: }
+      let(:domain) { '  HOST.example/' }
+
+      it { is_expected.to eq(domain_allow) }
+    end
+  end
 end

spec/models/domain_block_spec.rb

@@ -35,6 +35,17 @@ RSpec.describe DomainBlock do
       expect(described_class.rule_for('example.com')).to eq block
     end
 
+    it 'returns most specific rule matching a blocked domain' do
+      _block = Fabricate(:domain_block, domain: 'example.com')
+      blog_block = Fabricate(:domain_block, domain: 'blog.example.com')
+      expect(described_class.rule_for('host.blog.example.com')).to eq blog_block
+    end
+
+    it 'returns rule matching a blocked domain when string needs normalization' do
+      block = Fabricate(:domain_block, domain: 'example.com')
+      expect(described_class.rule_for('  example.com/')).to eq block
+    end
+
     it 'returns a rule matching a subdomain of a blocked domain' do
       block = Fabricate(:domain_block, domain: 'example.com')
       expect(described_class.rule_for('sub.example.com')).to eq block

spec/models/email_domain_block_spec.rb

@@ -4,6 +4,8 @@ require 'rails_helper'
 
 RSpec.describe EmailDomainBlock do
   describe 'block?' do
+    subject { described_class.block?(input) }
+
     let(:input) { nil }
 
     context 'when given an e-mail address' do
@@ -14,12 +16,12 @@ RSpec.describe EmailDomainBlock do
 
         it 'returns true if the domain is blocked' do
           Fabricate(:email_domain_block, domain: 'example.com')
-          expect(described_class.block?(input)).to be true
+          expect(subject).to be true
         end
 
         it 'returns false if the domain is not blocked' do
           Fabricate(:email_domain_block, domain: 'other-example.com')
-          expect(described_class.block?(input)).to be false
+          expect(subject).to be false
         end
       end
 
@@ -28,7 +30,7 @@ RSpec.describe EmailDomainBlock do
 
         it 'returns true if it is a subdomain of a blocked domain' do
           Fabricate(:email_domain_block, domain: 'example.com')
-          expect(described_class.block?(input)).to be true
+          expect(subject).to be true
         end
       end
     end
@@ -38,8 +40,40 @@ RSpec.describe EmailDomainBlock do
 
       it 'returns true if the domain is blocked' do
         Fabricate(:email_domain_block, domain: 'mail.foo.com')
-        expect(described_class.block?(input)).to be true
+        expect(subject).to be true
       end
     end
+
+    context 'when given nil' do
+      it { is_expected.to be false }
+    end
+
+    context 'when given empty string' do
+      let(:input) { '' }
+
+      it { is_expected.to be true }
+    end
+  end
+
+  describe '.requires_approval?' do
+    subject { described_class.requires_approval?(input) }
+
+    let(:input) { nil }
+
+    context 'with a matching block requiring approval' do
+      before { Fabricate :email_domain_block, domain: input, allow_with_approval: true }
+
+      let(:input) { 'host.example' }
+
+      it { is_expected.to be true }
+    end
+
+    context 'with a matching block not requiring approval' do
+      before { Fabricate :email_domain_block, domain: input, allow_with_approval: false }
+
+      let(:input) { 'host.example' }
+
+      it { is_expected.to be false }
+    end
   end
 end

spec/models/preview_card_provider_spec.rb

@@ -25,4 +25,36 @@ RSpec.describe PreviewCardProvider do
       end
     end
   end
+
+  describe '.matching_domain' do
+    subject { described_class.matching_domain(domain) }
+
+    let(:domain) { 'host.example' }
+
+    context 'without matching domains' do
+      it { is_expected.to be_nil }
+    end
+
+    context 'with exact matching domain' do
+      let!(:preview_card_provider) { Fabricate :preview_card_provider, domain: 'host.example' }
+
+      it { is_expected.to eq(preview_card_provider) }
+    end
+
+    context 'with matching domain segment' do
+      let!(:preview_card_provider) { Fabricate :preview_card_provider, domain: 'host.example' }
+      let(:domain) { 'www.blog.host.example' }
+
+      it { is_expected.to eq(preview_card_provider) }
+    end
+
+    context 'with multiple matching records' do
+      let!(:preview_card_provider_more) { Fabricate :preview_card_provider, domain: 'blog.host.example' }
+      let(:domain) { 'www.blog.host.example' }
+
+      before { Fabricate :preview_card_provider, domain: 'host.example' }
+
+      it { is_expected.to eq(preview_card_provider_more) }
+    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