Fix wrong notification count

Signed-off-by: Ajay Bura <ajbura@gmail.com>

diff --git a/src/app/organisms/navigation/DrawerBreadcrumb.jsx b/src/app/organisms/navigation/DrawerBreadcrumb.jsx
index 61d8d08142944738842f65f42c0feacadd2935f2..ca9ab6a096783123f0c2506818964a1b2d9ba49b 100644 (file)
--- a/src/app/organisms/navigation/DrawerBreadcrumb.jsx
+++ b/src/app/organisms/navigation/DrawerBreadcrumb.jsx
@@ -72,14 +72,22 @@ function DrawerBreadcrumb({ spaceId }) {
     const noti = notifications.getNoti(roomId);
     if (!notifications.hasNoti(childId)) return noti;
     if (noti.from === null) return noti;
-    if (noti.from.has(childId) && noti.from.size === 1) return null;
 
     const childNoti = notifications.getNoti(childId);
 
-    return {
-      total: noti.total - childNoti.total,
-      highlight: noti.highlight - childNoti.highlight,
-    };
+    let noOther = true;
+    let total = 0;
+    let highlight = 0;
+    noti.from.forEach((fromId) => {
+      if (childNoti.from.has(fromId)) return;
+      noOther = false;
+      const fromNoti = notifications.getNoti(fromId);
+      total += fromNoti.total;
+      highlight += fromNoti.highlight;
+    });
+
+    if (noOther) return null;
+    return { total, highlight };
   }
 
   return (

diff --git a/src/client/state/Notifications.js b/src/client/state/Notifications.js
index a41633ba05c94c44d7b960b5aca0f71621e61cd8..edb29ee92ec2823d3e65216e707428c498dd1fd7 100644 (file)
--- a/src/client/state/Notifications.js
+++ b/src/client/state/Notifications.js
@@ -42,8 +42,7 @@ class Notifications extends EventEmitter {
       if (this.doesRoomHaveUnread(room) === false) return;
       const total = room.getUnreadNotificationCount('total');
       const highlight = room.getUnreadNotificationCount('highlight');
-      const noti = this.getNoti(room.roomId);
-      this._setNoti(room.roomId, total - noti.total, highlight - noti.highlight);
+      this._setNoti(room.roomId, total ?? 0, highlight ?? 0);
     };
     [...this.roomList.rooms].forEach(addNoti);
     [...this.roomList.directs].forEach(addNoti);
@@ -96,74 +95,64 @@ class Notifications extends EventEmitter {
     }
   }
 
-  _getAllParentIds(roomId) {
-    let allParentIds = this.roomList.roomIdToParents.get(roomId);
-    if (allParentIds === undefined) return new Set();
-    const parentIds = [...allParentIds];
+  _setNoti(roomId, total, highlight) {
+    const addNoti = (id, t, h, fromId) => {
+      const prevTotal = this.roomIdToNoti.get(id)?.total ?? null;
+      const noti = this.getNoti(id);
 
-    parentIds.forEach((pId) => {
-      allParentIds = new Set(
-        [...allParentIds, ...this._getAllParentIds(pId)],
-      );
-    });
+      noti.total += t;
+      noti.highlight += h;
 
-    return allParentIds;
-  }
+      if (fromId) {
+        if (noti.from === null) noti.from = new Set();
+        noti.from.add(fromId);
+      }
+      this.roomIdToNoti.set(id, noti);
+      this.emit(cons.events.notifications.NOTI_CHANGED, id, noti.total, prevTotal);
+    };
 
-  _setNoti(roomId, total, highlight, childId) {
-    const prevTotal = this.roomIdToNoti.get(roomId)?.total ?? null;
     const noti = this.getNoti(roomId);
-
-    if (!childId || this._remainingParentIds?.has(roomId)) {
-      noti.total += total;
-      noti.highlight += highlight;
-    }
-    if (childId) {
-      if (noti.from === null) noti.from = new Set();
-      noti.from.add(childId);
-    }
-
-    this.roomIdToNoti.set(roomId, noti);
-    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);
-    if (typeof parentIds === 'undefined') {
-      if (!childId) this._remainingParentIds = undefined;
-      return;
-    }
-    [...parentIds].forEach((parentId) => this._setNoti(parentId, total, highlight, roomId));
-    if (!childId) this._remainingParentIds = undefined;
+    const addT = total - noti.total;
+    const addH = highlight - noti.highlight;
+    if (addT < 0 || addH < 0) return;
+
+    addNoti(roomId, addT, addH);
+    const allParentSpaces = this.roomList.getParentSpaces(roomId);
+    allParentSpaces.forEach((spaceId) => {
+      addNoti(spaceId, addT, addH, roomId);
+    });
   }
 
-  _deleteNoti(roomId, total, highlight, childId) {
-    if (this.roomIdToNoti.has(roomId) === false) return;
-
-    const noti = this.getNoti(roomId);
-    const prevTotal = noti.total;
-    noti.total -= total;
-    noti.highlight -= highlight;
-    if (noti.total < 0) {
-      noti.total = 0;
-      noti.highlight = 0;
-    }
-    if (childId && noti.from !== null) {
-      if (!this.hasNoti(childId)) noti.from.delete(childId);
-    }
-    if (noti.from === null || noti.from.size === 0) {
-      this.roomIdToNoti.delete(roomId);
-      this.emit(cons.events.notifications.FULL_READ, roomId);
-      this.emit(cons.events.notifications.NOTI_CHANGED, roomId, null, prevTotal);
-    } else {
-      this.roomIdToNoti.set(roomId, noti);
-      this.emit(cons.events.notifications.NOTI_CHANGED, roomId, noti.total, prevTotal);
-    }
+  _deleteNoti(roomId, total, highlight) {
+    const removeNoti = (id, t, h, fromId) => {
+      if (this.roomIdToNoti.has(id) === false) return;
+
+      const noti = this.getNoti(id);
+      const prevTotal = noti.total;
+      noti.total -= t;
+      noti.highlight -= h;
+      if (noti.total < 0) {
+        noti.total = 0;
+        noti.highlight = 0;
+      }
+      if (fromId && noti.from !== null) {
+        if (!this.hasNoti(fromId)) noti.from.delete(fromId);
+      }
+      if (noti.from === null || noti.from.size === 0) {
+        this.roomIdToNoti.delete(id);
+        this.emit(cons.events.notifications.FULL_READ, id);
+        this.emit(cons.events.notifications.NOTI_CHANGED, id, null, prevTotal);
+      } else {
+        this.roomIdToNoti.set(id, noti);
+        this.emit(cons.events.notifications.NOTI_CHANGED, id, noti.total, prevTotal);
+      }
+    };
 
-    const parentIds = this.roomList.roomIdToParents.get(roomId);
-    if (typeof parentIds === 'undefined') return;
-    [...parentIds].forEach((parentId) => this._deleteNoti(parentId, total, highlight, roomId));
+    removeNoti(roomId, total, highlight);
+    const allParentSpaces = this.roomList.getParentSpaces(roomId);
+    allParentSpaces.forEach((spaceId) => {
+      removeNoti(spaceId, total, highlight, roomId);
+    });
   }
 
   async _displayPopupNoti(mEvent, room) {
@@ -214,8 +203,7 @@ class Notifications extends EventEmitter {
       const total = room.getUnreadNotificationCount('total');
       const highlight = room.getUnreadNotificationCount('highlight');
 
-      const noti = this.getNoti(room.roomId);
-      this._setNoti(room.roomId, total - noti.total, highlight - noti.highlight);
+      this._setNoti(room.roomId, total ?? 0, highlight ?? 0);
 
       if (this.matrixClient.getSyncState() === 'SYNCING') {
         this._displayPopupNoti(mEvent, room);