diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-19 15:00:14 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-11-19 15:00:14 -0500 |
| commit | 95c3306798e1ca6429f3f52797a5d1b6ce7d6f37 (patch) | |
| tree | b43e191ea43c44a12b4c60c5a3a2ff09bc814e79 /synapse/rest | |
| parent | Ignore forgotten rooms in v2 sync (diff) | |
| parent | Merge branch 'develop' into daniel/forgetrooms (diff) | |
| download | synapse-95c3306798e1ca6429f3f52797a5d1b6ce7d6f37.tar.xz | |
Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 6 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/tags.py | 4 |
2 files changed, 5 insertions, 5 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: diff --git a/synapse/rest/client/v2_alpha/tags.py b/synapse/rest/client/v2_alpha/tags.py index 35482ae6a6..ba7223be11 100644 --- a/synapse/rest/client/v2_alpha/tags.py +++ b/synapse/rest/client/v2_alpha/tags.py @@ -81,7 +81,7 @@ class TagServlet(RestServlet): max_id = yield self.store.add_tag_to_room(user_id, room_id, tag, body) yield self.notifier.on_new_event( - "private_user_data_key", max_id, users=[user_id] + "account_data_key", max_id, users=[user_id] ) defer.returnValue((200, {})) @@ -95,7 +95,7 @@ class TagServlet(RestServlet): max_id = yield self.store.remove_tag_from_room(user_id, room_id, tag) yield self.notifier.on_new_event( - "private_user_data_key", max_id, users=[user_id] + "account_data_key", max_id, users=[user_id] ) defer.returnValue((200, {})) |