maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2533 from matrix-org/erikj/fix_group_repl

Browse source 
Fix group stream replication
This commit is contained in:
Erik Johnston 2017-10-11 16:01:57 +01:00 committed by GitHub
parent 68fd82e840 818b08d0e4
commit af94ba9d02
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
synapse/storage/group_server.py
View file

@ -1172,13 +1172,13 @@ class GroupServerStore(SQLBaseStore):
LIMIT ? LIMIT ?
""" """
txn.execute(sql, (from_token, to_token, limit,)) txn.execute(sql, (from_token, to_token, limit,))
return [{ return [(
"stream_id": stream_id, stream_id,
"group_id": group_id, group_id,
"user_id": user_id, user_id,
"type": gtype, gtype,
"content": json.loads(content_json), json.loads(content_json),
} for stream_id, group_id, user_id, gtype, content_json in txn] ) 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,
) )