Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-16 17:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon

Browse Source 
Port 4838085d66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire
2025-08-06 16:54:03 +02:00
parent 4b507c0f05
commit 9da8c9e07c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/flavours/glitch/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/flavours/glitch/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'),
); );
}; };