From 48237949ad6821e61c839fff14bb86738fab0575 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 4 May 2021 16:44:29 +0100
Subject: [PATCH] Only aggregate DM notifications on the Space Panel in the
 Home Space

---
 src/stores/SpaceStore.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index ec6227e45e..22307d9f2e 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -406,7 +406,19 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         this.spaceFilteredRooms.forEach((roomIds, s) => {
             // Update NotificationStates
-            this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => roomIds.has(room.roomId)));
+            this.getNotificationState(s)?.setRooms(visibleRooms.filter(room => {
+                if (roomIds.has(room.roomId)) {
+                    // Don't aggregate notifications for DMs except in the Home Space
+                    if (s !== HOME_SPACE) {
+                        return !DMRoomMap.shared().getUserIdForRoomId(room.roomId)
+                            || RoomListStore.instance.getTagsForRoom(room).includes(DefaultTagID.Favourite);
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }));
         });
     }, 100, {trailing: true, leading: true});