Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Never close notifs unless clicking them as all browsers only seem to show the last one anyway

Browse source
This commit is contained in:
Bruno Windels 2021-03-25 11:13:54 +01:00
parent fb6f31d958
commit 07fc49e371
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/platform/web/service-worker.js
View file

@ -236,18 +236,16 @@ async function handlePushNotification(n) {
} }
const newMessageNotifs = Array.from(await self.registration.getNotifications({tag: NOTIF_TAG_NEW_MESSAGE})); const newMessageNotifs = Array.from(await self.registration.getNotifications({tag: NOTIF_TAG_NEW_MESSAGE}));
const notifsForRoom = newMessageNotifs.filter(n => n.data.roomId === roomId); const notifsForRoom = newMessageNotifs.filter(n => n.data.roomId === roomId);
const nonMultiNotifsForRoom = newMessageNotifs.filter(n => !n.data.multi);
const roomName = n.room_name || n.room_alias;
const hasMultiNotification = notifsForRoom.some(n => n.data.multi); const hasMultiNotification = notifsForRoom.some(n => n.data.multi);
let notifsToClose; const hasSingleNotifsForRoom = newMessageNotifs.some(n => !n.data.multi);
const roomName = n.room_name || n.room_alias;
let multi = false; let multi = false;
let label; let label;
let body; let body;
if (hasMultiNotification) { if (hasMultiNotification) {
console.log("already have a multi message, don't do anything"); console.log("already have a multi message, don't do anything");
return; return;
} else if (nonMultiNotifsForRoom.length) { } else if (hasSingleNotifsForRoom) {
notifsToClose = nonMultiNotifsForRoom;
console.log("showing multi message notification"); console.log("showing multi message notification");
multi = true; multi = true;
label = roomName || sender; label = roomName || sender;
@ -267,16 +265,6 @@ async function handlePushNotification(n) {
tag: NOTIF_TAG_NEW_MESSAGE, tag: NOTIF_TAG_NEW_MESSAGE,
badge: NOTIFICATION_BADGE_ICON badge: NOTIFICATION_BADGE_ICON
}); });
// close any previous notifications for this room
// AFTER showing the new notification as on Android
// where we can only show 1 notification, this creates
// a smoother transition
if (notifsToClose) {
for (const notif of notifsToClose) {
console.log("close previous notification");
notif.close();
}
}
} }
// we could consider hiding previous notifications here based on the unread count // we could consider hiding previous notifications here based on the unread count
// (although we can't really figure out which notifications to hide) and also hiding // (although we can't really figure out which notifications to hide) and also hiding