summary refs log tree commit diff
path: root/synapse/storage/group_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-11 15:44:37 +0100
committerErik Johnston <erik@matrix.org>2017-10-11 15:44:39 +0100
commitea18996f54194f920dc506201a65eb3d36bb161d (patch)
treed5900fe3c3a251640f146251a818b4eb325290b2 /synapse/storage/group_server.py
parentMerge pull request #2530 from matrix-org/rav/fix_receipt_logcontext (diff)
downloadsynapse-ea18996f54194f920dc506201a65eb3d36bb161d.tar.xz
Fix group stream replication
The stream update functions expect the storage function to return a list
of tuples.
Diffstat (limited to 'synapse/storage/group_server.py')
-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..22a6bc6261 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,
         )