diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
| commit | dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25 (patch) | |
| tree | f1647aaf46015d8da38d7ed1c6192cc835f13192 /synapse/rest/client/v2_alpha/sync.py | |
| parent | Put back the 'state.events' subobject (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25.tar.xz | |
Merge branch 'develop' into rav/flatten_sync_response
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 88bb7ab52b..775f49885b 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -274,8 +274,8 @@ class SyncRestServlet(RestServlet): serialized_state = [serialize(e) for e in state_events] serialized_timeline = [serialize(e) for e in timeline_events] - private_user_data = filter.filter_room_private_user_data( - room.private_user_data + account_data = filter.filter_room_account_data( + room.account_data ) result = { @@ -285,7 +285,7 @@ class SyncRestServlet(RestServlet): "limited": room.timeline.limited, }, "state": {"events": serialized_state}, - "private_user_data": {"events": private_user_data}, + "account_data": {"events": account_data}, } if joined: |