summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-03 15:02:47 +0000
committerErik Johnston <erik@matrix.org>2016-02-03 15:02:47 +0000
commit8450114098544ff948d1c48b451ee72bbb8d582b (patch)
tree8bc5bef6c35b42d9c19c77656d54988939a4eff6 /synapse/handlers
parentMerge pull request #556 from matrix-org/daniel/config (diff)
parentChange event_push_actions_rm_tokens schema (diff)
downloadsynapse-8450114098544ff948d1c48b451ee72bbb8d582b.tar.xz
Merge pull request #554 from matrix-org/erikj/event_push
Change event_push_actions_rm_tokens schema
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sync.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index dc686db541..0292e06733 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -706,10 +706,8 @@ class SyncHandler(BaseHandler):
             )
 
             if notifs is not None:
-                unread_notifications["notification_count"] = len(notifs)
-                unread_notifications["highlight_count"] = len([
-                    1 for notif in notifs if _action_has_highlight(notif["actions"])
-                ])
+                unread_notifications["notification_count"] = notifs["notify_count"]
+                unread_notifications["highlight_count"] = notifs["highlight_count"]
 
         logger.debug("Room sync: %r", room_sync)