From 060d3b0713307dc247a2bf4b0d4bc957ffab97f6 Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 18 Mar 2019 12:30:34 -0400 Subject: [PATCH] #436: implement is_seen logic --- .../entity_normalizer.service.js | 2 +- .../notifications_fetcher.service.js | 32 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 06f7e938..36a9508a 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -280,7 +280,7 @@ export const parseNotification = (data) => { if (masto) { output.type = mastoDict[data.type] || data.type - // output.seen = ??? missing + output.seen = data.pleroma.is_seen output.status = output.type === 'follow' ? parseFollow(data) : parseStatus(data.status) diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js index 9eac5ab4..60c497ae 100644 --- a/src/services/notifications_fetcher/notifications_fetcher.service.js +++ b/src/services/notifications_fetcher/notifications_fetcher.service.js @@ -11,33 +11,35 @@ const fetchAndUpdate = ({store, credentials, older = false}) => { const rootState = store.rootState || store.state const timelineData = rootState.statuses.notifications + args['timeline'] = 'notifications' if (older) { if (timelineData.minId !== Number.POSITIVE_INFINITY) { args['until'] = timelineData.minId } + return fetchNotifications({ store, args, older }) } else { + // fetch new notifications if (timelineData.maxId !== Number.POSITIVE_INFINITY) { args['since'] = timelineData.maxId } - // # disabled until is_seen is impelented on the BE - // 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 - // } else { - // args['since'] = Math.min(...unread) - 1 - // if (timelineData.maxId !== Math.max(...unread)) { - // args['until'] = Math.max(...unread, args['since'] + 20) - // } - // } + const result = fetchNotifications({ store, args, older }) + + // 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) + fetchNotifications({ store, args, older }) + } + + return result } +} - args['timeline'] = 'notifications' - +const fetchNotifications = ({ store, args, older }) => { return apiService.fetchTimeline(args) .then((notifications) => { - update({store, notifications, older}) + update({ store, notifications, older }) return notifications }, () => store.dispatch('setNotificationsError', { value: true })) .catch(() => store.dispatch('setNotificationsError', { value: true }))