diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 17:31:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 17:31:10 +0000 |
| commit | af301406216339cc48bcd9481fb7810690048e1f (patch) | |
| tree | d1382cf2c9055e4c7ea3bb5e29d0e14f60798ee6 /synapse/rest | |
| parent | Don't use form of get_state_for_events with None state_key (diff) | |
| parent | Only compute unread notifications for rooms we send down stream (diff) | |
| download | synapse-af301406216339cc48bcd9481fb7810690048e1f.tar.xz | |
Merge pull request #506 from matrix-org/erikj/push_fast
Only compute unread notifications for rooms we send down stream
Diffstat (limited to 'synapse/rest')
| -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 |