gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20241015

Browse source
This commit is contained in:
KMY 2024-10-15 07:24:37 +09:00
commit ebdf1ecf49
24 changed files with 560 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -594,7 +594,10 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
)
state.lastReadId = mostRecentGroup.page_max_id;
commitLastReadId(state);
// We don't call `commitLastReadId`, because that is conditional
// and we want to unconditionally update the state instead.
state.readMarkerId = state.lastReadId;
})
.addCase(fetchMarkers.fulfilled, (state, action) => {
if (