Merge 3a365176aa 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": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
-  "filtered_notifications_banner.pending_requests": "Notifications 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,27 +10170,12 @@ 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;
     border-radius: 100px;
     padding: 2px 8px;
   }
-  }
 }
 
 .notification-request {

db/migrate/.rubocop.yml

@@ -2,3 +2,7 @@ inherit_from: ../../.rubocop.yml
 
 Naming/VariableNumber:
   CheckSymbols: false
+
+Rails/CreateTableWithTimestamps:
+  Include:
+    - '*.rb'

db/migrate/20170508230434_create_conversation_mutes.rb

@@ -2,7 +2,7 @@
 
 class CreateConversationMutes < ActiveRecord::Migration[5.0]
   def change
-    create_table :conversation_mutes do |t|
+    create_table :conversation_mutes do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.integer :account_id, null: false
       t.bigint :conversation_id, null: false
     end

db/migrate/20170823162448_create_status_pins.rb

@@ -2,7 +2,7 @@
 
 class CreateStatusPins < ActiveRecord::Migration[5.1]
   def change
-    create_table :status_pins do |t|
+    create_table :status_pins do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
       t.belongs_to :status, foreign_key: { on_delete: :cascade }, null: false
     end

db/migrate/20171116161857_create_list_accounts.rb

@@ -2,7 +2,7 @@
 
 class CreateListAccounts < ActiveRecord::Migration[5.2]
   def change
-    create_table :list_accounts do |t|
+    create_table :list_accounts do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.belongs_to :list, foreign_key: { on_delete: :cascade }, null: false
       t.belongs_to :account, foreign_key: { on_delete: :cascade }, null: false
       t.belongs_to :follow, foreign_key: { on_delete: :cascade }, null: false

db/migrate/20180929222014_create_account_conversations.rb

@@ -2,7 +2,7 @@
 
 class CreateAccountConversations < ActiveRecord::Migration[5.2]
   def change
-    create_table :account_conversations do |t|
+    create_table :account_conversations do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.belongs_to :account, foreign_key: { on_delete: :cascade }
       t.belongs_to :conversation, foreign_key: { on_delete: :cascade }
       t.bigint :participant_account_ids, array: true, null: false, default: []

db/migrate/20181007025445_create_pghero_space_stats.rb

@@ -2,7 +2,7 @@
 
 class CreatePgheroSpaceStats < ActiveRecord::Migration[5.2]
   def change
-    create_table :pghero_space_stats do |t|
+    create_table :pghero_space_stats do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.text :database
       t.text :schema
       t.text :relation

db/migrate/20190103124649_create_scheduled_statuses.rb

@@ -2,7 +2,7 @@
 
 class CreateScheduledStatuses < ActiveRecord::Migration[5.2]
   def change
-    create_table :scheduled_statuses do |t|
+    create_table :scheduled_statuses do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.belongs_to :account, foreign_key: { on_delete: :cascade }
       t.datetime :scheduled_at, index: true
       t.jsonb :params

db/migrate/20220824233535_create_status_trends.rb

@@ -2,7 +2,7 @@
 
 class CreateStatusTrends < ActiveRecord::Migration[6.1]
   def change
-    create_table :status_trends do |t|
+    create_table :status_trends do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :status, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
       t.references :account, null: false, foreign_key: { on_delete: :cascade }
       t.float :score, null: false, default: 0

db/migrate/20221006061337_create_preview_card_trends.rb

@@ -2,7 +2,7 @@
 
 class CreatePreviewCardTrends < ActiveRecord::Migration[6.1]
   def change
-    create_table :preview_card_trends do |t|
+    create_table :preview_card_trends do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :preview_card, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
       t.float :score, null: false, default: 0
       t.integer :rank, null: false, default: 0