summary refs log tree commit diff
path: root/synapse/storage/event_push_actions.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-19 11:35:50 +0000
committerErik Johnston <erik@matrix.org>2016-01-19 11:35:50 +0000
commit3adcc4c86aade29f502b7245acc2353326a62256 (patch)
tree1070c3251ee6ca69808619007fb954cd9bc9c5a6 /synapse/storage/event_push_actions.py
parentMerge pull request #502 from matrix-org/erikj/push_notif_perf (diff)
downloadsynapse-3adcc4c86aade29f502b7245acc2353326a62256.tar.xz
Return highlight_count in /sync
Diffstat (limited to 'synapse/storage/event_push_actions.py')
-rw-r--r--synapse/storage/event_push_actions.py5
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(