Merge cb92313c46 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/admin/metrics/measure/instance_accounts_measure.rb

@@ -37,7 +37,7 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
         WITH new_accounts AS (
           SELECT accounts.id
           FROM accounts
-          WHERE date_trunc('day', accounts.created_at)::date = axis.period
+          WHERE #{matching_day(Account, :created_at)}
             AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_accounts

app/lib/admin/metrics/measure/instance_followers_measure.rb

@@ -38,7 +38,7 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
           SELECT follows.id
           FROM follows
           INNER JOIN accounts ON follows.account_id = accounts.id
-          WHERE date_trunc('day', follows.created_at)::date = axis.period
+          WHERE #{matching_day(Follow, :created_at)}
             AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_followers

app/lib/admin/metrics/measure/instance_follows_measure.rb

@@ -38,7 +38,7 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
           SELECT follows.id
           FROM follows
           INNER JOIN accounts ON follows.target_account_id = accounts.id
-          WHERE date_trunc('day', follows.created_at)::date = axis.period
+          WHERE #{matching_day(Follow, :created_at)}
             AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_follows

app/lib/admin/metrics/measure/instance_media_attachments_measure.rb

@@ -47,7 +47,7 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
           SELECT #{media_size_total} AS size
           FROM media_attachments
           INNER JOIN accounts ON accounts.id = media_attachments.account_id
-          WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
+          WHERE #{matching_day(MediaAttachment, :created_at)}
             AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT COALESCE(SUM(size), 0) FROM new_media_attachments

app/lib/admin/metrics/measure/instance_reports_measure.rb

@@ -38,7 +38,7 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
           SELECT reports.id
           FROM reports
           INNER JOIN accounts ON accounts.id = reports.target_account_id
-          WHERE date_trunc('day', reports.created_at)::date = axis.period
+          WHERE #{matching_day(Report, :created_at)}
             AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_reports

app/lib/admin/metrics/measure/instance_statuses_measure.rb

@@ -40,7 +40,7 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
           INNER JOIN accounts ON accounts.id = statuses.account_id
           WHERE statuses.id BETWEEN :earliest_status_id AND :latest_status_id
             AND #{account_domain_sql(params[:include_subdomains])}
-            AND date_trunc('day', statuses.created_at)::date = axis.period
+            AND #{matching_day(Status, :created_at)}
         )
         SELECT count(*) FROM new_statuses
       ) AS value

app/lib/admin/metrics/measure/new_users_measure.rb

@@ -27,7 +27,7 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
         WITH new_users AS (
           SELECT users.id
           FROM users
-          WHERE date_trunc('day', users.created_at)::date = axis.period
+          WHERE #{matching_day(User, :created_at)}
         )
         SELECT count(*) FROM new_users
       ) AS value

app/lib/admin/metrics/measure/opened_reports_measure.rb

@@ -27,7 +27,7 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
         WITH new_reports AS (
           SELECT reports.id
           FROM reports
-          WHERE date_trunc('day', reports.created_at)::date = axis.period
+          WHERE #{matching_day(Report, :created_at)}
         )
         SELECT count(*) FROM new_reports
       ) AS value

app/lib/admin/metrics/measure/query_helper.rb

@@ -23,6 +23,12 @@ module Admin::Metrics::Measure::QueryHelper
     )
   end
 
+  def matching_day(model, column)
+    <<~SQL.squish
+      DATE_TRUNC('day', #{model.table_name}.#{column})::date = axis.period
+    SQL
+  end
+
   def account_domain_sql(include_subdomains)
     if include_subdomains
       "accounts.domain IN (SELECT domain FROM instances WHERE reverse('.' || domain) LIKE reverse('.' || :domain::text))"

app/lib/admin/metrics/measure/resolved_reports_measure.rb

@@ -27,7 +27,7 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
         WITH resolved_reports AS (
           SELECT reports.id
           FROM reports
-          WHERE date_trunc('day', reports.action_taken_at)::date = axis.period
+          WHERE #{matching_day(Report, :action_taken_at)}
         )
         SELECT count(*) FROM resolved_reports
       ) AS value

app/lib/admin/metrics/measure/tag_servers_measure.rb

@@ -35,7 +35,7 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
           INNER JOIN accounts ON statuses.account_id = accounts.id
           WHERE statuses_tags.tag_id = :tag_id
             AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
-            AND date_trunc('day', statuses.created_at)::date = axis.period
+            AND #{matching_day(Status, :created_at)}
         )
         SELECT COUNT(*) FROM tag_servers
       ) AS value

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
 

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