commit: dd740043c658f312b6331a6b715592c9d50c50e7
parent: 9b8cdb652518e55cd126d70d3902a0953979c145
Author: Shpuld Shpuldson <shpuld@shpposter.club>
Date: Tue, 14 Jan 2020 13:39:17 +0200
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
Diffstat:
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -2,7 +2,6 @@ import apiService from '../api/api.service.js'
const update = ({ store, notifications, older }) => {
store.dispatch('setNotificationsError', { value: false })
-
store.dispatch('addNewNotifications', { notifications, older })
}
@@ -30,9 +29,9 @@ const fetchAndUpdate = ({ store, credentials, older = false }) => {
// load unread notifications repeatedly 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'] = Math.min(...unread)
+ const readNotifsIds = notifications.filter(n => n.seen).map(n => n.id)
+ if (readNotifsIds.length) {
+ args['since'] = Math.max(...readNotifsIds)
fetchNotifications({ store, args, older })
}