summary refs log tree commit diff
path: root/synapse/storage/group_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-20 10:52:12 +0100
committerErik Johnston <erik@matrix.org>2017-09-20 10:52:12 +0100
commit069ae2df126418b5be1c96727a578cfd1dd4e506 (patch)
tree524d5aca0083555a58d9287b2b7f80e5b5e3cd70 /synapse/storage/group_server.py
parentMerge pull request #2454 from matrix-org/erikj/groups_sync_creator (diff)
downloadsynapse-069ae2df126418b5be1c96727a578cfd1dd4e506.tar.xz
Fix initial sync
Diffstat (limited to 'synapse/storage/group_server.py')
-rw-r--r--synapse/storage/group_server.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 5433063507..b0399f8133 100644
--- a/synapse/storage/group_server.py
+++ b/synapse/storage/group_server.py
@@ -1085,7 +1085,15 @@ class GroupServerStore(SQLBaseStore):
                     AND stream_id <= ?
             """
             txn.execute(sql, (user_id, now_token,))
-            return self.cursor_to_dict(txn)
+            return [
+                {
+                    "group_id": row[0],
+                    "type": row[1],
+                    "membership": row[2],
+                    "content": json.loads(row[3]),
+                }
+                for row in txn
+            ]
         return self.runInteraction(
             "get_all_groups_for_user", _get_all_groups_for_user_txn,
         )