tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source 
Groups: Fix mising json.load in initial sync
This commit is contained in:
Erik Johnston 2017-08-21 16:37:14 +01:00 committed by GitHub
commit 73b4e18c62
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
synapse/storage/group_server.py
View file

@ -1101,7 +1101,13 @@ class GroupServerStore(SQLBaseStore):
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(
"get_all_groups_changes", _get_all_groups_changes_txn,
)