diff options
| author | David Baker <dave@matrix.org> | 2016-01-20 13:33:45 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-20 13:33:45 +0000 |
| commit | ccf9387d57ba57e3b996b48134cfac8142a19cbe (patch) | |
| tree | d58abd587b00c88dcc6ec127df68f0d29d5cb112 /synapse/rest/client/v2_alpha/sync.py | |
| parent | Merge branch 'develop' into push_badge_counts (diff) | |
| parent | Merge pull request #506 from matrix-org/erikj/push_fast (diff) | |
| download | synapse-ccf9387d57ba57e3b996b48134cfac8142a19cbe.tar.xz | |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index e300ced214..df4b305b49 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -312,8 +312,7 @@ class SyncRestServlet(RestServlet): if joined: 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 + result["unread_notifications"] = room.unread_notifications return result |