summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sync.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-19 15:21:35 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-19 15:21:35 +0000
commit7a802ec0ff394e763218122a6f90c07f8a9b7532 (patch)
treee0c699beeacdcc35ca77f8563d1611fd82811f0a /synapse/rest/client/v2_alpha/sync.py
parentMerge pull request #382 from matrix-org/daniel/macarooncleanup (diff)
parentRename the database table (diff)
downloadsynapse-7a802ec0ff394e763218122a6f90c07f8a9b7532.tar.xz
Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data
s/private_user_data/account_data/
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py6
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 efd8281558..8ac16f2a3c 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py
@@ -282,8 +282,8 @@ class SyncRestServlet(RestServlet): ) timeline_event_ids.append(event.event_id) - private_user_data = filter.filter_room_private_user_data( - room.private_user_data + account_data = filter.filter_room_account_data( + room.account_data ) result = { @@ -294,7 +294,7 @@ class SyncRestServlet(RestServlet): "limited": room.timeline.limited, }, "state": {"events": state_event_ids}, - "private_user_data": {"events": private_user_data}, + "account_data": {"events": account_data}, } if joined: