Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix all streamed notification types being stored without filtering (#31384)

Browse source
This commit is contained in:
Claire 2024-08-12 15:40:29 +02:00 • committed by GitHub
parent 709dcd07f2
commit a7b718c31a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/javascript/mastodon/actions/notification_groups.ts
View file

@ -15,6 +15,7 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
import {
selectSettingsNotificationsExcludedTypes,
selectSettingsNotificationsQuickFilterActive,
selectSettingsNotificationsShows,
} from 'mastodon/selectors/settings';
import type { AppDispatch } from 'mastodon/store';
import {
@ -104,7 +105,31 @@ export const fetchNotificationsGap = createDataLoadingThunk(
export const processNewNotificationForGroups = createAppAsyncThunk(
'notificationGroups/processNew',
(notification: ApiNotificationJSON, { dispatch }) => {
(notification: ApiNotificationJSON, { dispatch, getState }) => {
const state = getState();
const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
const notificationShows = selectSettingsNotificationsShows(state);
const showInColumn =
activeFilter === 'all'
? notificationShows[notification.type]
: activeFilter === notification.type;
if (!showInColumn) return;
if (
(notification.type === 'mention' || notification.type === 'update') &&
notification.status.filtered
) {
const filters = notification.status.filtered.filter((result) =>
result.filter.context.includes('notifications'),
);
if (filters.some((result) => result.filter.filter_action === 'hide')) {
return;
}
}
dispatchAssociatedRecords(dispatch, [notification]);
return notification;