therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#436: add dismiss button, disable is_seen part

Browse source
This commit is contained in:
dave 2019-03-13 14:08:03 -04:00
parent cd9a7dd488
commit 2f7d890ad2
5 changed files with 68 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -65,8 +65,7 @@ export const parseUser = (data) => {
output.muted = pleroma.muted
}
// Missing, trying to recover
output.is_local = !output.screen_name.includes('@')
// TODO: handle is_local
} else {
output.screen_name = data.screen_name
@ -179,8 +178,7 @@ export const parseStatus = (data) => {
output.summary_html = data.spoiler_text
output.external_url = data.url
// FIXME missing!!
output.is_local = false
// TODO: handle is_local
} else {
output.favorited = data.favorited
output.fave_num = data.fave_num

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

@ -16,17 +16,21 @@ const fetchAndUpdate = ({store, credentials, older = false}) => {
args['until'] = timelineData.minId
}
} 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) {
if (timelineData.maxId !== Number.POSITIVE_INFINITY) {
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)
}
}
// # 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)
// }
// }
}
args['timeline'] = 'notifications'