Only include rooms with notifications and unread events in push badge…

… counts
Fizzadar · Mar 17, 2022 · 129aca1 · 129aca1
1 parent 2877450
commit 129aca1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/synapse/push/push_tools.py b/synapse/push/push_tools.py
@@ -37,7 +37,10 @@ async def get_badge_count(store: DataStore, user_id: str, group_by_room: bool) -
                     room_id, user_id, last_unread_event_id
                 )
             )
-            if notifs.notify_count == 0:
+
+            # Beeper change: Only count a room as having unread messages if we
+            # have both unread events (MSC2654) *and* notifications (ie, not muted).
+            if notifs.notify_count == 0 or notifs.unread_count == 0:
                 continue
 
             if group_by_room: