Merge 9778204e5d into a50c8e951f

app/javascript/mastodon/api_types/notifications.ts

@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {

app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx

@@ -49,22 +49,15 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
         {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
-      </div>
     </Link>
   );
 };

app/javascript/mastodon/locales/en.json

@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

app/javascript/mastodon/models/notification_group.ts

@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

app/javascript/styles/mastodon/components.scss

@@ -10170,20 +10170,6 @@ noscript {
     }
   }
 
-  &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
   &__badge {
     background: $ui-button-background-color;
     color: $white;
@@ -10191,7 +10177,6 @@ noscript {
     padding: 2px 8px;
   }
 }
-}
 
 .notification-request {
   display: flex;

app/workers/activitypub/low_priority_delivery_worker.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActivityPub::LowPriorityDeliveryWorker < ActivityPub::DeliveryWorker
-  sidekiq_options queue: 'pull', retry: 8, dead: false
+  sidekiq_options queue: 'low_priority', retry: 8, dead: false
 end

app/workers/scheduler/suspended_user_cleanup_scheduler.rb

@@ -6,7 +6,7 @@ class Scheduler::SuspendedUserCleanupScheduler
   # Each processed deletion request may enqueue an enormous
   # amount of jobs in the `pull` queue, so only enqueue when
   # the queue is empty or close to being so.
-  MAX_PULL_SIZE = 50
+  MAX_QUEUE_SIZE = 50
 
   # Since account deletion is very expensive, we want to avoid
   # overloading the server by queuing too much at once.
@@ -19,7 +19,7 @@ class Scheduler::SuspendedUserCleanupScheduler
   sidekiq_options retry: 0, lock: :until_executed, lock_ttl: 1.day.to_i
 
   def perform
-    return if Sidekiq::Queue.new('pull').size > MAX_PULL_SIZE
+    return if Sidekiq::Queue.new('low_priority').size > MAX_QUEUE_SIZE
 
     process_deletion_requests!
   end

config/sidekiq.yml

@@ -4,8 +4,9 @@
   - [default, 8]
   - [push, 6]
   - [ingress, 4]
-  - [mailers, 2]
-  - [pull]
+  - [mailers, 3]
+  - [pull, 2]
+  - [low_priority]
   - [scheduler]
 
 :scheduler: