From fab29ebbe864f0aec84857fc3d87f0d56f4f6b9b Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Sep 2024 15:28:16 +0200
Subject: [PATCH] Fix all notification types being stored without filtering
when polling (#31745)
---
.../mastodon/actions/notification_groups.ts | 33 ++++++++++---------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 51f83f1d24..2ee46500ab 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -18,7 +18,7 @@ import {
selectSettingsNotificationsQuickFilterActive,
selectSettingsNotificationsShows,
} from 'mastodon/selectors/settings';
-import type { AppDispatch } from 'mastodon/store';
+import type { AppDispatch, RootState } from 'mastodon/store';
import {
createAppAsyncThunk,
createDataLoadingThunk,
@@ -32,6 +32,14 @@ function excludeAllTypesExcept(filter: string) {
return allNotificationTypes.filter((item) => item !== filter);
}
+function getExcludedTypes(state: RootState) {
+ const activeFilter = selectSettingsNotificationsQuickFilterActive(state);
+
+ return activeFilter === 'all'
+ ? selectSettingsNotificationsExcludedTypes(state)
+ : excludeAllTypesExcept(activeFilter);
+}
+
function dispatchAssociatedRecords(
dispatch: AppDispatch,
notifications: ApiNotificationGroupJSON[] | ApiNotificationJSON[],
@@ -62,17 +70,8 @@ function dispatchAssociatedRecords(
export const fetchNotifications = createDataLoadingThunk(
'notificationGroups/fetch',
- async (_params, { getState }) => {
- const activeFilter =
- selectSettingsNotificationsQuickFilterActive(getState());
-
- return apiFetchNotifications({
- exclude_types:
- activeFilter === 'all'
- ? selectSettingsNotificationsExcludedTypes(getState())
- : excludeAllTypesExcept(activeFilter),
- });
- },
+ async (_params, { getState }) =>
+ apiFetchNotifications({ exclude_types: getExcludedTypes(getState()) }),
({ notifications, accounts, statuses }, { dispatch }) => {
dispatch(importFetchedAccounts(accounts));
dispatch(importFetchedStatuses(statuses));
@@ -92,9 +91,11 @@ export const fetchNotifications = createDataLoadingThunk(
export const fetchNotificationsGap = createDataLoadingThunk(
'notificationGroups/fetchGap',
- async (params: { gap: NotificationGap }) =>
- apiFetchNotifications({ max_id: params.gap.maxId }),
-
+ async (params: { gap: NotificationGap }, { getState }) =>
+ apiFetchNotifications({
+ max_id: params.gap.maxId,
+ exclude_types: getExcludedTypes(getState()),
+ }),
({ notifications, accounts, statuses }, { dispatch }) => {
dispatch(importFetchedAccounts(accounts));
dispatch(importFetchedStatuses(statuses));
@@ -109,6 +110,7 @@ export const pollRecentNotifications = createDataLoadingThunk(
async (_params, { getState }) => {
return apiFetchNotifications({
max_id: undefined,
+ exclude_types: getExcludedTypes(getState()),
// In slow mode, we don't want to include notifications that duplicate the already-displayed ones
since_id: usePendingItems
? getState().notificationGroups.groups.find(
@@ -183,7 +185,6 @@ export const setNotificationsFilter = createAppAsyncThunk(
path: ['notifications', 'quickFilter', 'active'],
value: filterType,
});
- // dispatch(expandNotifications({ forceLoad: true }));
void dispatch(fetchNotifications());
dispatch(saveSettings());
},