summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-19 13:21:48 +0000
committerErik Johnston <erik@matrix.org>2016-01-19 13:21:48 +0000
commit05f78b3b52447413d75f034e1aefba7b5afd21ef (patch)
tree106c48041d9aeb0b4035b732e061b8e7aa3e232e /synapse/rest/client
parentMerge pull request #486 from matrix-org/default_notify (diff)
parentReturn highlight_count in /sync (diff)
downloadsynapse-05f78b3b52447413d75f034e1aefba7b5afd21ef.tar.xz
Merge pull request #504 from matrix-org/erikj/highlight_count
Return highlight_count in /sync
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 826f9db189..e300ced214 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -313,6 +313,7 @@ class SyncRestServlet(RestServlet):
             ephemeral_events = filter.filter_room_ephemeral(room.ephemeral)
             result["ephemeral"] = {"events": ephemeral_events}
             result["unread_notification_count"] = room.unread_notification_count
+            result["unread_highlight_count"] = room.unread_highlight_count
 
         return result