diff options
| author | Erik Johnston <erikj@jki.re> | 2017-08-21 16:37:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 16:37:14 +0100 |
| commit | 73b4e18c62f43a857cc36918586fd291e10fc7e7 (patch) | |
| tree | daa58e639f8ad3c5fa1c9c6567666ec14a832b28 /synapse | |
| parent | Remove stale TODO comments (diff) | |
| parent | Groups: Fix mising json.load in initial sync (diff) | |
| download | synapse-73b4e18c62f43a857cc36918586fd291e10fc7e7.tar.xz | |
Merge pull request #2426 from matrix-org/erikj/groups_fix_sync
Groups: Fix mising json.load in initial sync
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/group_server.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py index f44e80b514..792a57deb5 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py @@ -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, ) |