Merge 68abd26c25 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/annual_report/percentiles.rb

@@ -2,15 +2,7 @@
 
 class AnnualReport::Percentiles < AnnualReport::Source
   def self.prepare(year)
-    AnnualReport::StatusesPerAccountCount.connection.exec_query(<<~SQL.squish, nil, [year, Mastodon::Snowflake.id_at(DateTime.new(year).beginning_of_year), Mastodon::Snowflake.id_at(DateTime.new(year).end_of_year)])
-      INSERT INTO annual_report_statuses_per_account_counts (year, account_id, statuses_count)
-      SELECT $1, account_id, count(*)
-      FROM statuses
-      WHERE id BETWEEN $2 AND $3
-      AND (local OR uri IS NULL)
-      GROUP BY account_id
-      ON CONFLICT (year, account_id) DO NOTHING
-    SQL
+    AnnualReport::StatusesPerAccountCount.refresh(year)
   end
 
   def generate

app/models/annual_report/statuses_per_account_count.rb

@@ -11,5 +11,35 @@
 #
 
 class AnnualReport::StatusesPerAccountCount < ApplicationRecord
-  # This table facilitates percentile calculations
+  def self.refresh(year)
+    connection.exec_query(<<~SQL.squish)
+      INSERT INTO #{table_name} (year, account_id, statuses_count)
+      #{AccountStatusCountQuery.new(year).to_sql}
+      ON CONFLICT (year, account_id) DO NOTHING
+    SQL
+  end
+
+  class AccountStatusCountQuery
+    def initialize(year)
+      @year = year
+    end
+
+    def to_sql
+      Status
+        .unscoped
+        .local
+        .where(id: beginning_of_year..end_of_year)
+        .group(:account_id)
+        .select(@year, :account_id, Arel.star.count)
+        .to_sql
+    end
+
+    def beginning_of_year
+      Mastodon::Snowflake.id_at(DateTime.new(@year).beginning_of_year, with_random: false)
+    end
+
+    def end_of_year
+      Mastodon::Snowflake.id_at(DateTime.new(@year).end_of_year, with_random: false)
+    end
+  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/fabricators/annual_report/statuses_per_account_count_fabricator.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator :annual_report_statuses_per_account_count, from: 'AnnualReport::StatusesPerAccountCount' do
+  year { Time.zone.now.year }
+  account_id { Fabricate(:account).id }
+  statuses_count { 123 }
+end

spec/lib/annual_report/percentiles_spec.rb

@@ -7,13 +7,10 @@ RSpec.describe AnnualReport::Percentiles do
     subject { described_class.new(account, year) }
 
     let(:year) { Time.zone.now.year }
+    let(:account) { Fabricate :account }
 
-    context 'with an inactive account' do
-      let(:account) { Fabricate :account }
-
+    context 'with no status data' do
       it 'builds a report for an account' do
-        described_class.prepare(year)
-
         expect(subject.generate)
           .to include(
             percentiles: include(
@@ -23,17 +20,16 @@ RSpec.describe AnnualReport::Percentiles do
       end
     end
 
-    context 'with an active account' do
-      let(:account) { Fabricate :account }
-
+    context 'with status count data' do
       before do
-        Fabricate.times 2, :status # Others as `account`
+        # Simulate scenario where other accounts have each made one status
+        Fabricate.times 2, :annual_report_statuses_per_account_count, statuses_count: 1
+
         Fabricate.times 2, :status, account: account
+        Fabricate :annual_report_statuses_per_account_count, account_id: account.id, statuses_count: 2
       end
 
       it 'builds a report for an account' do
-        described_class.prepare(year)
-
         expect(subject.generate)
           .to include(
             percentiles: include(

spec/models/annual_report/statuses_per_account_count_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnualReport::StatusesPerAccountCount do
+  describe '.refresh' do
+    subject { described_class.refresh(year) }
+
+    let(:year) { Time.zone.now.year }
+
+    context 'with an inactive account' do
+      let(:account) { Fabricate :account }
+
+      it 'does not build a status count record' do
+        expect { subject }
+          .to not_change(described_class, :count).from(0)
+      end
+    end
+
+    context 'with an active account' do
+      let(:account) { Fabricate :account }
+
+      before do
+        Fabricate :status
+        Fabricate.times 2, :status, account: account
+      end
+
+      it 'builds a status count record' do
+        expect { subject }
+          .to change(described_class, :count).by(2)
+        expect(described_class.where(account_id: account).first)
+          .to have_attributes(statuses_count: 2)
+      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