Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700)

app/javascript/mastodon/actions/notification_groups.ts

@@ -31,7 +31,9 @@ import { NOTIFICATIONS_FILTER_SET } from './notifications';
 import { saveSettings } from './settings';
 
 function excludeAllTypesExcept(filter: string) {
-  return allNotificationTypes.filter((item) => item !== filter);
+  return allNotificationTypes.filter(
+    (item) => item !== filter && !(item === 'quote' && filter === 'mention'),
+  );
 }
 
 function getExcludedTypes(state: RootState) {
@@ -156,7 +158,8 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
     const showInColumn =
       activeFilter === 'all'
         ? notificationShows[notification.type] !== false
-        : activeFilter === notification.type;
+        : activeFilter === notification.type ||
+          (activeFilter === 'mention' && notification.type === 'quote');
 
     if (!showInColumn) return;
 

app/javascript/mastodon/selectors/notifications.ts

@@ -26,7 +26,10 @@ const filterNotificationsByAllowedTypes = (
     );
   }
   return notifications.filter(
-    (item) => item.type === 'gap' || allowedType === item.type,
+    (item) =>
+      item.type === 'gap' ||
+      allowedType === item.type ||
+      (allowedType === 'mention' && item.type === 'quote'),
   );
 };