diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
| commit | 427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch) | |
| tree | 608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/storage/room.py | |
| parent | Update README.rst (diff) | |
| parent | bump version/changelog (diff) | |
| download | synapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 908551d6d9..740c036975 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -594,7 +594,8 @@ class RoomStore(RoomWorkerStore, SearchStore): while next_token: sql = """ - SELECT stream_ordering, content FROM events + SELECT stream_ordering, json FROM events + JOIN event_json USING (event_id) WHERE room_id = ? AND stream_ordering < ? AND contains_url = ? AND outlier = ? @@ -606,8 +607,8 @@ class RoomStore(RoomWorkerStore, SearchStore): next_token = None for stream_ordering, content_json in txn: next_token = stream_ordering - content = json.loads(content_json) - + event_json = json.loads(content_json) + content = event_json["content"] content_url = content.get("url") thumbnail_url = content.get("info", {}).get("thumbnail_url") |