summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2015-11-19 12:23:42 +0000
committerRichard van der Hoff <richard@matrix.org>2015-11-19 12:23:42 +0000
commitf6e092f6cc8691d7f400a4a86daa16e8a8e3a2e6 (patch)
tree180fb301763d01ed1f9c93be89ea7a9e35bae18c /synapse/rest/client
parentv2 /sync: Rename the keys of the 'rooms' object to match member states (diff)
downloadsynapse-f6e092f6cc8691d7f400a4a86daa16e8a8e3a2e6.tar.xz
Put back the 'state.events' subobject
We're keeping 'events', in case we decide to add more keys later.
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index ff4e85d2e9..88bb7ab52b 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -284,7 +284,7 @@ class SyncRestServlet(RestServlet):
                 "prev_batch": room.timeline.prev_batch.to_string(),
                 "limited": room.timeline.limited,
             },
-            "state": serialized_state,
+            "state": {"events": serialized_state},
             "private_user_data": {"events": private_user_data},
         }