diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 13:21:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 13:21:48 +0000 |
| commit | 05f78b3b52447413d75f034e1aefba7b5afd21ef (patch) | |
| tree | 106c48041d9aeb0b4035b732e061b8e7aa3e232e /synapse/storage | |
| parent | Merge pull request #486 from matrix-org/default_notify (diff) | |
| parent | Return highlight_count in /sync (diff) | |
| download | synapse-05f78b3b52447413d75f034e1aefba7b5afd21ef.tar.xz | |
Merge pull request #504 from matrix-org/erikj/highlight_count
Return highlight_count in /sync
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/event_push_actions.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py index d99171ee87..6b7cebc9ce 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -17,7 +17,7 @@ from ._base import SQLBaseStore from twisted.internet import defer import logging -import simplejson as json +import ujson as json logger = logging.getLogger(__name__) @@ -84,7 +84,8 @@ class EventPushActionsStore(SQLBaseStore): ) ) return [ - {"event_id": row[0], "actions": row[1]} for row in txn.fetchall() + {"event_id": row[0], "actions": json.loads(row[1])} + for row in txn.fetchall() ] ret = yield self.runInteraction( |