Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-29 17:02:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove uses of events.content

Browse source
This commit is contained in:
Richard van der Hoff 2018-03-29 23:05:33 +01:00
parent 88cc9cc69e
commit 2fe3f848b9
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/room.py
View file

@ -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")