summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-11 16:01:57 +0100
committerGitHub <noreply@github.com>2017-10-11 16:01:57 +0100
commitaf94ba9d02b258b155530e19b4b717e8f6105f94 (patch)
treeb8db6409c0a912eb973b270e10f6a634b67835d3 /synapse
parentMerge pull request #2530 from matrix-org/rav/fix_receipt_logcontext (diff)
parentpeeeeeeeeep8888888888888888888888888888 (diff)
downloadsynapse-af94ba9d02b258b155530e19b4b717e8f6105f94.tar.xz
Merge pull request #2533 from matrix-org/erikj/fix_group_repl
Fix group stream replication
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/group_server.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 4fe9172adc..3af372de59 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -1172,13 +1172,13 @@ class GroupServerStore(SQLBaseStore):
                 LIMIT ?
             """
             txn.execute(sql, (from_token, to_token, limit,))
-            return [{
-                "stream_id": stream_id,
-                "group_id": group_id,
-                "user_id": user_id,
-                "type": gtype,
-                "content": json.loads(content_json),
-            } for stream_id, group_id, user_id, gtype, content_json in txn]
+            return [(
+                stream_id,
+                group_id,
+                user_id,
+                gtype,
+                json.loads(content_json),
+            ) for stream_id, group_id, user_id, gtype, content_json in txn]
         return self.runInteraction(
             "get_all_groups_changes", _get_all_groups_changes_txn,
         )