gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-07 09:32:44 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Claire 2025-08-06 16:54:03 +02:00 committed by GitHub
parent 9ec99ffef1
commit 4838085d66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/actions/notification_groups.ts
View File

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

5
app/javascript/mastodon/selectors/notifications.ts
View File

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