treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix crashes when connection drops

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2020-09-15 23:43:36 +02:00 committed by ThibG
parent f1c0cf9806
commit 60eebc6cc4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/notifications/index.js
View File

@ -60,7 +60,7 @@ const mapStateToProps = state => ({
numPending: state.getIn(['notifications', 'pendingItems'], ImmutableList()).size, numPending: state.getIn(['notifications', 'pendingItems'], ImmutableList()).size,
notifCleaningActive: state.getIn(['notifications', 'cleaningMode']), notifCleaningActive: state.getIn(['notifications', 'cleaningMode']),
lastReadId: state.getIn(['notifications', 'readMarkerId']), lastReadId: state.getIn(['notifications', 'readMarkerId']),
canMarkAsRead: !state.getIn(['notifications', 'items']).isEmpty() && state.getIn(['notifications', 'readMarkerId']) !== '0' && compareId(state.getIn(['notifications', 'items']).first().get('id'), state.getIn(['notifications', 'readMarkerId'])) > 0, canMarkAsRead: state.getIn(['notifications', 'readMarkerId']) !== '0' && getNotifications(state).some(item => item !== null && compareId(item.get('id'), state.getIn(['notifications', 'readMarkerId'])) > 0),
}); });
/* glitch */ /* glitch */

7
app/javascript/flavours/glitch/reducers/notifications.js
View File

@ -110,8 +110,8 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
if (shouldCountUnreadNotifications(state)) { if (shouldCountUnreadNotifications(state)) {
mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0)); mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0));
} else { } else {
const mostRecentId = items.first().get('id'); const mostRecent = items.find(item => item !== null);
if (compareId(lastReadId, mostRecentId) < 0) { if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) {
mutable.set('lastReadId', mostRecentId); mutable.set('lastReadId', mostRecentId);
} }
} }
@ -299,7 +299,8 @@ export default function notifications(state = initialState, action) {
return markAllForDelete(st, action.yes); return markAllForDelete(st, action.yes);
case NOTIFICATIONS_MARK_AS_READ: case NOTIFICATIONS_MARK_AS_READ:
return recountUnread(state, state.get('items').first().get('id')); const lastNotification = state.get('items').find(item => item !== null);
return lastNotification ? recountUnread(state, lastNotification.get('id')) : state;
default: default:
return state; return state;