Merge be0489ac1f 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/ip_block.rb

@@ -31,9 +31,10 @@ class IpBlock < ApplicationRecord
 
   after_commit :reset_cache
 
-  def to_log_human_identifier
+  def to_cidr
     "#{ip}/#{ip.prefix}"
   end
+  alias to_log_human_identifier to_cidr
 
   class << self
     def blocked?(remote_ip)

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/serializers/rest/admin/ip_block_serializer.rb

@@ -9,6 +9,6 @@ class REST::Admin::IpBlockSerializer < ActiveModel::Serializer
   end
 
   def ip
-    "#{object.ip}/#{object.ip.prefix}"
+    object.to_cidr
   end
 end

app/views/admin/ip_blocks/_ip_block.html.haml

@@ -3,7 +3,7 @@
     = f.check_box :ip_block_ids, { multiple: true, include_hidden: false }, ip_block.id
   .batch-table__row__content.pending-account
     .pending-account__header
-      %samp= link_to "#{ip_block.ip}/#{ip_block.ip.prefix}", admin_accounts_path(ip: "#{ip_block.ip}/#{ip_block.ip.prefix}")
+      %samp= link_to ip_block.to_cidr, admin_accounts_path(ip: ip_block.to_cidr)
       - if ip_block.comment.present?
         ·
         = ip_block.comment

lib/mastodon/cli/ip_blocks.rb

@@ -107,9 +107,9 @@ module Mastodon::CLI
       IpBlock.severity_no_access.find_each do |ip_block|
         case options[:format]
         when 'nginx'
-          say "deny #{ip_block.ip}/#{ip_block.ip.prefix};"
+          say "deny #{ip_block.to_cidr};"
         else
-          say "#{ip_block.ip}/#{ip_block.ip.prefix}"
+          say ip_block.to_cidr
         end
       end
     end

spec/lib/mastodon/cli/ip_blocks_spec.rb

@@ -251,12 +251,12 @@ RSpec.describe Mastodon::CLI::IpBlocks do
 
       it 'exports blocked IPs with "no_access" severity in plain format' do
         expect { subject }
-          .to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
+          .to output_results("#{first_ip_range_block.to_cidr}\n#{second_ip_range_block.to_cidr}")
       end
 
       it 'does not export blocked IPs with different severities' do
         expect { subject }
-          .to_not output_results("#{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}")
+          .to_not output_results(third_ip_range_block.to_cidr)
       end
     end
 
@@ -265,19 +265,19 @@ RSpec.describe Mastodon::CLI::IpBlocks do
 
       it 'exports blocked IPs with "no_access" severity in plain format' do
         expect { subject }
-          .to output_results("deny #{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};\ndeny #{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix};")
+          .to output_results("deny #{first_ip_range_block.to_cidr};\ndeny #{second_ip_range_block.to_cidr};")
       end
 
       it 'does not export blocked IPs with different severities' do
         expect { subject }
-          .to_not output_results("deny #{third_ip_range_block.ip}/#{first_ip_range_block.ip.prefix};")
+          .to_not output_results("deny #{third_ip_range_block.to_cidr};")
       end
     end
 
     context 'when --format option is not provided' do
       it 'exports blocked IPs in plain format by default' do
         expect { subject }
-          .to output_results("#{first_ip_range_block.ip}/#{first_ip_range_block.ip.prefix}\n#{second_ip_range_block.ip}/#{second_ip_range_block.ip.prefix}")
+          .to output_results("#{first_ip_range_block.to_cidr}\n#{second_ip_range_block.to_cidr}")
       end
     end
   end

spec/models/ip_block_spec.rb

@@ -26,6 +26,22 @@ RSpec.describe IpBlock do
     end
   end
 
+  describe '#to_cidr' do
+    subject { Fabricate.build(:ip_block, ip:).to_cidr }
+
+    context 'with an IP and a specified prefix' do
+      let(:ip) { '192.168.1.0/24' }
+
+      it { is_expected.to eq('192.168.1.0/24') }
+    end
+
+    context 'with an IP and a default prefix' do
+      let(:ip) { '192.168.1.0' }
+
+      it { is_expected.to eq('192.168.1.0/32') }
+    end
+  end
+
   describe '.blocked?' do
     context 'when the IP is blocked' do
       it 'returns true' do

spec/requests/api/v1/admin/ip_blocks_spec.rb

@@ -97,7 +97,7 @@ RSpec.describe 'IP Blocks' do
 
       expect(response.parsed_body)
         .to include(
-          ip: eq("#{ip_block.ip}/#{ip_block.ip.prefix}"),
+          ip: eq(ip_block.to_cidr),
           severity: eq(ip_block.severity.to_s)
         )
     end
@@ -216,7 +216,7 @@ RSpec.describe 'IP Blocks' do
       expect(response.content_type)
         .to start_with('application/json')
       expect(response.parsed_body).to match(hash_including({
-        ip: "#{ip_block.ip}/#{ip_block.ip.prefix}",
+        ip: ip_block.to_cidr,
         severity: 'sign_up_requires_approval',
         comment: 'Decreasing severity',
       }))

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