Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#380: fix false alarm for unread notifications

Browse source
This commit is contained in:
dave 2019-02-25 12:12:49 -05:00
parent 1dd7120e16
commit 4e8b696797
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules/statuses.js
View file

@ -303,6 +303,9 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
setTimeout(notification.close.bind(notification), 5000) setTimeout(notification.close.bind(notification), 5000)
} }
} }
} else if (notification.seen) {
state.notifications.data.find(n => n.id === notification.id).seen = true
state.notifications.idStore[notification.id].seen = true
} }
}) })
} }

10
src/services/notifications_fetcher/notifications_fetcher.service.js
View file

@ -16,7 +16,17 @@ const fetchAndUpdate = ({store, credentials, older = false}) => {
args['until'] = timelineData.minId args['until'] = timelineData.minId
} }
} else { } else {
// load unread notifications repeadedly to provide consistency between browser tabs
const notifications = timelineData.data
const unread = notifications.filter(n => !n.seen).map(n => n.id)
if (!unread.length) {
args['since'] = timelineData.maxId args['since'] = timelineData.maxId
} else {
args['since'] = Math.min(...unread) - 1
if (timelineData.maxId !== Math.max(...unread)) {
args['until'] = Math.max(...unread, args['since'] + 20)
}
}
} }
args['timeline'] = 'notifications' args['timeline'] = 'notifications'