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

Merge pull request #686 from kmycode/upstream-20240401

Browse source 
Upstream 20240401
This commit is contained in:
KMY（雪あすか） 2024-04-01 09:21:13 +09:00 • committed by GitHub
commit 7b02596f1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
111 changed files with 989 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/reducers/notifications.js
View file

@ -13,7 +13,7 @@ import {
unfocusApp,
} from '../actions/app';
import {
MARKERS_FETCH_SUCCESS,
fetchMarkers,
} from '../actions/markers';
import {
notificationsUpdate,
@ -259,8 +259,8 @@ const recountUnread = (state, last_read_id) => {
export default function notifications(state = initialState, action) {
switch(action.type) {
case MARKERS_FETCH_SUCCESS:
return action.markers.notifications ? recountUnread(state, action.markers.notifications.last_read_id) : state;
case fetchMarkers.fulfilled.type:
return action.payload.markers.notifications ? recountUnread(state, action.payload.markers.notifications.last_read_id) : state;
case NOTIFICATIONS_MOUNT:
return updateMounted(state);
case NOTIFICATIONS_UNMOUNT: