Skip to content
Snippets Groups Projects
Commit 73b4e18c authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Merge pull request #2426 from matrix-org/erikj/groups_fix_sync

Groups: Fix mising json.load in initial sync
parents a1e67bcb 175a01f5
No related branches found
No related tags found
No related merge requests found
...@@ -1101,7 +1101,13 @@ class GroupServerStore(SQLBaseStore): ...@@ -1101,7 +1101,13 @@ class GroupServerStore(SQLBaseStore):
LIMIT ? LIMIT ?
""" """
txn.execute(sql, (from_token, to_token, limit,)) txn.execute(sql, (from_token, to_token, limit,))
return txn.fetchall() 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 self.runInteraction( return self.runInteraction(
"get_all_groups_changes", _get_all_groups_changes_txn, "get_all_groups_changes", _get_all_groups_changes_txn,
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment