diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-11-19 15:21:35 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-11-19 15:21:35 +0000 |
commit | 7a802ec0ff394e763218122a6f90c07f8a9b7532 (patch) | |
tree | e0c699beeacdcc35ca77f8563d1611fd82811f0a /synapse/handlers/message.py | |
parent | Merge pull request #382 from matrix-org/daniel/macarooncleanup (diff) | |
parent | Rename the database table (diff) | |
download | synapse-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/handlers/message.py')
-rw-r--r-- | synapse/handlers/message.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 14051aee99..2e7d0d7f82 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -436,14 +436,14 @@ class MessageHandler(BaseHandler): for c in current_state.values() ] - private_user_data = [] + account_data = [] tags = tags_by_room.get(event.room_id) if tags: - private_user_data.append({ + account_data.append({ "type": "m.tag", "content": {"tags": tags}, }) - d["private_user_data"] = private_user_data + d["account_data"] = account_data except: logger.exception("Failed to get snapshot") @@ -498,14 +498,14 @@ class MessageHandler(BaseHandler): user_id, room_id, pagin_config, membership, member_event_id, is_guest ) - private_user_data = [] + account_data = [] tags = yield self.store.get_tags_for_room(user_id, room_id) if tags: - private_user_data.append({ + account_data.append({ "type": "m.tag", "content": {"tags": tags}, }) - result["private_user_data"] = private_user_data + result["account_data"] = account_data defer.returnValue(result) |