hippoz/cinny
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix duplicate notification count

Browse source 
Signed-off-by: Ajay Bura <ajbura@gmail.com>
This commit is contained in:
Ajay Bura 2021-10-28 15:08:26 +05:30
parent af983c76b8
commit 60435d505f
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/client/state/Notifications.js
View file

@ -77,12 +77,28 @@ class Notifications extends EventEmitter {
return this.roomIdToNoti.has(roomId); return this.roomIdToNoti.has(roomId);
} }
_getAllParentIds(roomId) {
let allParentIds = this.roomList.roomIdToParents.get(roomId);
if (allParentIds === undefined) return new Set();
const parentIds = [...allParentIds];
parentIds.forEach((pId) => {
allParentIds = new Set(
[...allParentIds, ...this._getAllParentIds(pId)],
);
});
return allParentIds;
}
_setNoti(roomId, total, highlight, childId) { _setNoti(roomId, total, highlight, childId) {
const prevTotal = this.roomIdToNoti.get(roomId)?.total ?? null; const prevTotal = this.roomIdToNoti.get(roomId)?.total ?? null;
const noti = this.getNoti(roomId); const noti = this.getNoti(roomId);
noti.total += total; if (!childId || this._remainingParentIds?.has(roomId)) {
noti.highlight += highlight; noti.total += total;
noti.highlight += highlight;
}
if (childId) { if (childId) {
if (noti.from === null) noti.from = new Set(); if (noti.from === null) noti.from = new Set();
noti.from.add(childId); noti.from.add(childId);
@ -91,9 +107,16 @@ class Notifications extends EventEmitter {
this.roomIdToNoti.set(roomId, noti); this.roomIdToNoti.set(roomId, noti);
this.emit(cons.events.notifications.NOTI_CHANGED, roomId, noti.total, prevTotal); this.emit(cons.events.notifications.NOTI_CHANGED, roomId, noti.total, prevTotal);
if (!childId) this._remainingParentIds = this._getAllParentIds(roomId);
else this._remainingParentIds.delete(roomId);
const parentIds = this.roomList.roomIdToParents.get(roomId); const parentIds = this.roomList.roomIdToParents.get(roomId);
if (typeof parentIds === 'undefined') return; if (typeof parentIds === 'undefined') {
if (!childId) this._remainingParentIds = undefined;
return;
}
[...parentIds].forEach((parentId) => this._setNoti(parentId, total, highlight, roomId)); [...parentIds].forEach((parentId) => this._setNoti(parentId, total, highlight, roomId));
if (!childId) this._remainingParentIds = undefined;
} }
_deleteNoti(roomId, total, highlight, childId) { _deleteNoti(roomId, total, highlight, childId) {
@ -108,7 +131,7 @@ class Notifications extends EventEmitter {
noti.highlight = 0; noti.highlight = 0;
} }
if (childId && noti.from !== null) { if (childId && noti.from !== null) {
noti.from.delete(childId); if (!this.hasNoti(childId)) noti.from.delete(childId);
} }
if (noti.from === null || noti.from.size === 0) { if (noti.from === null || noti.from.size === 0) {
this.roomIdToNoti.delete(roomId); this.roomIdToNoti.delete(roomId);