Merge 375ea60b9f into 14cb5ff881

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

app/helpers/admin/dashboard_helper.rb

@@ -30,7 +30,7 @@ module Admin::DashboardHelper
                          [account.user_current_sign_in_at, false]
                        elsif account.user_pending?
                          [account.user_created_at, true]
-                       elsif account.suspended_at.present? && account.local? && account.user.nil?
+                       elsif account.suspended_at? && account.local? && account.user.nil?
                          [account.suspended_at, true]
                        elsif account.last_status_at.present?
                          [account.last_status_at, true]

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/account.rb

@@ -245,7 +245,7 @@ class Account < ApplicationRecord
   end
 
   def schedule_refresh_if_stale!
-    return unless last_webfingered_at.present? && last_webfingered_at <= BACKGROUND_REFRESH_INTERVAL.ago
+    return unless last_webfingered_at? && last_webfingered_at <= BACKGROUND_REFRESH_INTERVAL.ago
 
     AccountRefreshWorker.perform_in(rand(REFRESH_DEADLINE), id)
   end

app/models/account_warning.rb

@@ -47,7 +47,7 @@ class AccountWarning < ApplicationRecord
   end
 
   def overruled?
-    overruled_at.present?
+    overruled_at?
   end
 
   def appeal_eligible?

app/models/announcement.rb

@@ -56,7 +56,7 @@ class Announcement < ApplicationRecord
   end
 
   def notification_sent?
-    notification_sent_at.present?
+    notification_sent_at?
   end
 
   def mentions

app/models/appeal.rb

@@ -40,11 +40,11 @@ class Appeal < ApplicationRecord
   end
 
   def approved?
-    approved_at.present?
+    approved_at?
   end
 
   def rejected?
-    rejected_at.present?
+    rejected_at?
   end
 
   def approve!(current_account)

app/models/concerns/account/sensitizes.rb

@@ -8,7 +8,7 @@ module Account::Sensitizes
   end
 
   def sensitized?
-    sensitized_at.present?
+    sensitized_at?
   end
 
   def sensitize!(date = Time.now.utc)

app/models/concerns/account/silences.rb

@@ -9,7 +9,7 @@ module Account::Silences
   end
 
   def silenced?
-    silenced_at.present?
+    silenced_at?
   end
 
   def silence!(date = Time.now.utc)

app/models/concerns/account/suspensions.rb

@@ -9,7 +9,7 @@ module Account::Suspensions
   end
 
   def suspended?
-    suspended_at.present? && !instance_actor?
+    suspended_at? && !instance_actor?
   end
   alias unavailable? suspended?
 

app/models/concerns/reviewable.rb

@@ -13,11 +13,11 @@ module Reviewable
   end
 
   def reviewed?
-    reviewed_at.present?
+    reviewed_at?
   end
 
   def requested_review?
-    requested_review_at.present?
+    requested_review_at?
   end
 
   def requires_review_notification?

app/models/concerns/status/snapshot_concern.rb

@@ -8,7 +8,7 @@ module Status::SnapshotConcern
   end
 
   def edited?
-    edited_at.present?
+    edited_at?
   end
 
   def build_snapshot(account_id: nil, at_time: nil, rate_limit: true)

app/models/concerns/user/activity.rb

@@ -17,7 +17,7 @@ module User::Activity
   end
 
   def signed_in_recently?
-    current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
+    current_sign_in_at? && current_sign_in_at >= ACTIVE_DURATION.ago
   end
 
   private

app/models/concerns/user/confirmation.rb

@@ -13,7 +13,7 @@ module User::Confirmation
   end
 
   def confirmed?
-    confirmed_at.present?
+    confirmed_at?
   end
 
   def unconfirmed?

app/models/featured_tag.rb

@@ -49,7 +49,7 @@ class FeaturedTag < ApplicationRecord
   def decrement(deleted_status)
     if statuses_count <= 1
       update(statuses_count: 0, last_status_at: nil)
-    elsif last_status_at.present? && last_status_at > deleted_status.created_at
+    elsif last_status_at? && last_status_at > deleted_status.created_at
       update(statuses_count: statuses_count - 1)
     else
       # Fetching the latest status creation time can be expensive, so only perform it

app/models/generated_annual_report.rb

@@ -20,7 +20,7 @@ class GeneratedAnnualReport < ApplicationRecord
   scope :pending, -> { where(viewed_at: nil) }
 
   def viewed?
-    viewed_at.present?
+    viewed_at?
   end
 
   def view!

app/models/report.rb

@@ -116,7 +116,7 @@ class Report < ApplicationRecord
   end
 
   def action_taken?
-    action_taken_at.present?
+    action_taken_at?
   end
 
   alias action_taken action_taken?

app/models/scheduled_status.rb

@@ -27,7 +27,7 @@ class ScheduledStatus < ApplicationRecord
   private
 
   def validate_future_date
-    errors.add(:scheduled_at, I18n.t('scheduled_statuses.too_soon')) if scheduled_at.present? && scheduled_at <= Time.now.utc + MINIMUM_OFFSET
+    errors.add(:scheduled_at, I18n.t('scheduled_statuses.too_soon')) if scheduled_at? && scheduled_at <= Time.now.utc + MINIMUM_OFFSET
   end
 
   def validate_total_limit

app/models/terms_of_service.rb

@@ -32,7 +32,7 @@ class TermsOfService < ApplicationRecord
   end
 
   def published?
-    published_at.present?
+    published_at?
   end
 
   def effective?
@@ -44,7 +44,7 @@ class TermsOfService < ApplicationRecord
   end
 
   def notification_sent?
-    notification_sent_at.present?
+    notification_sent_at?
   end
 
   def base_user_scope

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/services/update_status_service.rb

@@ -147,7 +147,7 @@ class UpdateStatusService < BaseService
     # If the poll had no expiration date set but now has, or now has a sooner
     # expiration date, schedule a notification
 
-    return unless poll.present? && poll.expires_at.present?
+    return unless poll.present? && poll.expires_at?
 
     PollExpirationNotifyWorker.remove_from_scheduled(poll.id) if @previous_expires_at.present? && @previous_expires_at > poll.expires_at
     PollExpirationNotifyWorker.perform_at(poll.expires_at + 5.minutes, poll.id)

app/workers/poll_expiration_notify_worker.rb

@@ -29,7 +29,7 @@ class PollExpirationNotifyWorker
   end
 
   def not_due_yet?
-    @poll.expires_at.present? && !@poll.expired?
+    @poll.expires_at? && !@poll.expired?
   end
 
   def requeue!

lib/mastodon/cli/accounts.rb

@@ -305,7 +305,7 @@ module Mastodon::CLI
       query = query.where(domain: domains) unless domains.empty?
 
       processed, culled = parallelize_with_progress(query.partitioned) do |account|
-        next if account.updated_at >= skip_threshold || (account.last_webfingered_at.present? && account.last_webfingered_at >= skip_threshold) || skip_domains.include?(account.domain)
+        next if account.updated_at >= skip_threshold || (account.last_webfingered_at? && account.last_webfingered_at >= skip_threshold) || skip_domains.include?(account.domain)
 
         code = 0
 

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
+  version: 1.92.0
-  resolution: "sass@npm:1.91.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