diff options
| author | Erik Johnston <erikj@jki.re> | 2017-04-07 09:39:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 09:39:52 +0100 |
| commit | 98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa (patch) | |
| tree | a6d9b00000e962c0a7e87bfe3d4a498f3f825641 /synapse/handlers/typing.py | |
| parent | Use iteritems (diff) | |
| parent | Document types of the replication streams (diff) | |
| download | synapse-98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa.tar.xz | |
Merge pull request #2103 from matrix-org/erikj/no-double-encode
Don't double encode 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 |