Merge 7db9e9fa83 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,21 +49,14 @@ 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 }}
-        />
+        {toCappedNumber(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

@@ -10171,25 +10171,10 @@ 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;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

spec/models/notification_spec.rb

@@ -151,62 +151,61 @@ RSpec.describe Notification do
     end
   end
 
-  describe '.paginate_groups_by_max_id' do
+  context 'with grouped notifications' do
     let(:account) { Fabricate(:account) }
 
-    let!(:notifications) do
-      ['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
-        .map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
-    end
+    let!(:group_one_oldest) { Fabricate(:notification, account: account, group_key: 'group-1') }
+    let!(:group_one_old) { Fabricate(:notification, account: account, group_key: 'group-1') }
+    let!(:group_nil_old) { Fabricate(:notification, account: account, group_key: nil) }
+    let!(:group_two_old) { Fabricate(:notification, account: account, group_key: 'group-2') }
+    let!(:group_nil_new) { Fabricate(:notification, account: account, group_key: nil) }
+    let!(:group_one_new) { Fabricate(:notification, account: account, group_key: 'group-1') }
+    let!(:group_two_new) { Fabricate(:notification, account: account, group_key: 'group-2') }
+    let!(:group_one_newest) { Fabricate(:notification, account: account, group_key: 'group-1') }
 
-    context 'without since_id or max_id' do
-      it 'returns the most recent notifications, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_max_id(4).pluck(:id))
-          .to eq [notifications[7], notifications[6], notifications[4], notifications[2]].pluck(:id)
+    describe '.paginate_groups_by_max_id' do
+      context 'without since_id or max_id' do
+        it 'returns the most recent notifications, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_max_id(4))
+            .to eq [group_one_newest, group_two_new, group_nil_new, group_nil_old]
+        end
+      end
+
+      context 'with since_id' do
+        it 'returns the most recent notifications, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: group_nil_new.id))
+            .to eq [group_one_newest, group_two_new]
+        end
+      end
+
+      context 'with max_id' do
+        it 'returns the most recent notifications after max_id, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: group_one_newest.id))
+            .to eq [group_two_new, group_one_new, group_nil_new, group_nil_old]
+        end
       end
     end
 
-    context 'with since_id' do
-      it 'returns the most recent notifications, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_max_id(4, since_id: notifications[4].id).pluck(:id))
-          .to eq [notifications[7], notifications[6]].pluck(:id)
+    describe '.paginate_groups_by_min_id' do
+      context 'without min_id or max_id' do
+        it 'returns the oldest notifications, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_min_id(4))
+            .to eq [group_one_oldest, group_nil_old, group_two_old, group_nil_new]
+        end
       end
-    end
 
-    context 'with max_id' do
-      it 'returns the most recent notifications after max_id, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_max_id(4, max_id: notifications[7].id).pluck(:id))
-          .to eq [notifications[6], notifications[5], notifications[4], notifications[2]].pluck(:id)
+      context 'with max_id' do
+        it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: group_nil_new.id))
+            .to eq [group_one_oldest, group_nil_old, group_two_old]
+        end
       end
-    end
-  end
 
-  describe '.paginate_groups_by_min_id' do
-    let(:account) { Fabricate(:account) }
-
-    let!(:notifications) do
-      ['group-1', 'group-1', nil, 'group-2', nil, 'group-1', 'group-2', 'group-1']
-        .map { |group_key| Fabricate(:notification, account: account, group_key: group_key) }
-    end
-
-    context 'without min_id or max_id' do
-      it 'returns the oldest notifications, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_min_id(4).pluck(:id))
-          .to eq [notifications[0], notifications[2], notifications[3], notifications[4]].pluck(:id)
-      end
-    end
-
-    context 'with max_id' do
-      it 'returns the oldest notifications, stopping at max_id, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_min_id(4, max_id: notifications[4].id).pluck(:id))
-          .to eq [notifications[0], notifications[2], notifications[3]].pluck(:id)
-      end
-    end
-
-    context 'with min_id' do
-      it 'returns the most oldest notifications after min_id, only keeping one notification per group' do
-        expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: notifications[0].id).pluck(:id))
-          .to eq [notifications[1], notifications[2], notifications[3], notifications[4]].pluck(:id)
+      context 'with min_id' do
+        it 'returns the most oldest notifications after min_id, only keeping one notification per group' do
+          expect(described_class.without_suspended.paginate_groups_by_min_id(4, min_id: group_one_oldest.id))
+            .to eq [group_one_old, group_nil_old, group_two_old, group_nil_new]
+        end
       end
     end
   end