diff options
author | Erik Johnston <erik@matrix.org> | 2017-04-05 11:34:20 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-04-05 11:34:20 +0100 |
commit | 96b9b6c1275087acf57faf1306bcc392dbd9f842 (patch) | |
tree | d6e6f13500d57ae2866ab76a2f616a8e89d79ac2 /synapse/handlers/typing.py | |
parent | Don't double json encode federation replication data (diff) | |
download | synapse-96b9b6c1275087acf57faf1306bcc392dbd9f842.tar.xz |
Don't double json encode typing replication data
Diffstat (limited to 'synapse/handlers/typing.py')
-rw-r--r-- | synapse/handlers/typing.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py index d6809862e0..3b7818af5c 100644 --- a/synapse/handlers/typing.py +++ b/synapse/handlers/typing.py @@ -24,7 +24,6 @@ from synapse.types import UserID, get_domain_from_id import logging from collections import namedtuple -import ujson as json logger = logging.getLogger(__name__) @@ -288,8 +287,7 @@ class TypingHandler(object): for room_id, serial in self._room_serials.items(): if last_id < serial and serial <= current_id: typing = self._room_typing[room_id] - typing_bytes = json.dumps(list(typing), ensure_ascii=False) - rows.append((serial, room_id, typing_bytes)) + rows.append((serial, room_id, list(typing))) rows.sort() return rows |