diff options
author | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-11-20 17:38:58 +0000 |
commit | 2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682 (patch) | |
tree | d5d1c71f050d27e929daa72954704ad330cc9194 /synapse/handlers/message.py | |
parent | Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff) | |
parent | Merge branch 'erikj/perspective_limiter' into release-v0.11.1 (diff) | |
download | synapse-2ca01ed7470bd1fb0aa9cab0ad0546ea2911b682.tar.xz |
Merge branch 'release-v0.11.1' of github.com:matrix-org/synapse v0.11.1
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) |