diff options
author | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-04-14 12:27:16 +0200 |
commit | 041b41a825e456db180a89a9e4df6ea9f3d01c5b (patch) | |
tree | db669225768b3322fe4d63451fdd05799634599a /synapse/storage/room.py | |
parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
parent | Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse (diff) | |
download | synapse-041b41a825e456db180a89a9e4df6ea9f3d01c5b.tar.xz |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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") |