From d3fa680373e8ff7f8ed730b6025e41a29efe6f0e Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Tue, 23 Aug 2016 11:14:45 +0100
Subject: [PATCH] Added all the notification states to the sub list count logic

---
 src/components/structures/RoomSubList.js | 26 ++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 740cb82e4e..2216910877 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -23,6 +23,7 @@ var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var Unread = require('matrix-react-sdk/lib/Unread');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
+var RoomNotifs = require('matrix-react-sdk/lib/RoomNotifs');
 
 // turn this on for drop & drag console debugging galore
 var debug = false;
@@ -221,24 +222,19 @@ var RoomSubList = React.createClass({
         var cli = MatrixClientPeg.get();
 
         this.state.sortedList.map(function(room) {
-            var notifsMuted = false;
-            if (!cli.isGuest()) {
-                var roomPushRule = cli.getRoomPushRule("global", room.roomId);
-                if (roomPushRule) {
-                    if (0 <= roomPushRule.actions.indexOf("dont_notify")) {
-                        notifsMuted = true;
-                    }
-                }
-            }
-
+            var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
             var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites';
-
             var notificationCount = room.getUnreadNotificationCount();
 
-            if (notificationCount > 0 && (!notifsMuted || (notifsMuted && highlight))) {
-                subListCount += notificationCount;
-                if (highlight) {
-                    subListHighlight = true;
+            if (notificationCount > 0 && roomNotifState !== RoomNotifs.MUTE) {
+                if (roomNotifState === RoomNotifs.ALL_MESSAGES_LOUD
+                    || roomNotifState === RoomNotifs.ALL_MESSAGES
+                    || (roomNotifState === RoomNotifs.MENTIONS_ONLY && highlight))
+                {
+                    subListCount += notificationCount;
+                    if (highlight) {
+                        subListHighlight = true;
+                    }
                 }
             }
         });