Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change group notifications unread markers to only be cleared when focusing/navigating again (#31325)

Browse source
This commit is contained in:
Claire 2024-08-07 13:12:42 +02:00 • committed by GitHub
parent af2aec1a82
commit 6f285bb2a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/javascript/mastodon/reducers/notification_groups.ts
View file

@ -48,6 +48,7 @@ interface NotificationGroupsState {
scrolledToTop: boolean;
isLoading: boolean;
lastReadId: string;
readMarkerId: string;
mounted: number;
isTabVisible: boolean;
}
@ -58,7 +59,8 @@ const initialState: NotificationGroupsState = {
scrolledToTop: false,
isLoading: false,
// The following properties are used to track unread notifications
lastReadId: '0', // used for unread notifications
lastReadId: '0', // used internally for unread notifications
readMarkerId: '0', // user-facing and updated when focus changes
mounted: 0, // number of mounted notification list components, usually 0 or 1
isTabVisible: true,
};
@ -284,6 +286,12 @@ function updateLastReadId(
}
}
function commitLastReadId(state: NotificationGroupsState) {
if (shouldMarkNewNotificationsAsRead(state)) {
state.readMarkerId = state.lastReadId;
}
}
export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
initialState,
(builder) => {
@ -457,6 +465,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
)
state.lastReadId = mostRecentGroup.page_max_id;
commitLastReadId(state);
})
.addCase(fetchMarkers.fulfilled, (state, action) => {
if (
@ -470,6 +479,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
})
.addCase(mountNotifications, (state) => {
state.mounted += 1;
commitLastReadId(state);
updateLastReadId(state);
})
.addCase(unmountNotifications, (state) => {
@ -477,6 +487,7 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
})
.addCase(focusApp, (state) => {
state.isTabVisible = true;
commitLastReadId(state);
updateLastReadId(state);
})
.addCase(unfocusApp, (state) => {