diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
| commit | 3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch) | |
| tree | 5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /synapse/storage/room.py | |
| parent | Backport deferred.addTimeout (diff) | |
| parent | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff) | |
| download | synapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz | |
Merge branch 'develop' into rav/deferred_timeout
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 740c036975..ea6a189185 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -530,7 +530,7 @@ class RoomStore(RoomWorkerStore, SearchStore): # Convert the IDs to MXC URIs for media_id in local_mxcs: - local_media_mxcs.append("mxc://%s/%s" % (self.hostname, media_id)) + local_media_mxcs.append("mxc://%s/%s" % (self.hs.hostname, media_id)) for hostname, media_id in remote_mxcs: remote_media_mxcs.append("mxc://%s/%s" % (hostname, media_id)) @@ -595,7 +595,7 @@ class RoomStore(RoomWorkerStore, SearchStore): while next_token: sql = """ SELECT stream_ordering, json FROM events - JOIN event_json USING (event_id) + JOIN event_json USING (room_id, event_id) WHERE room_id = ? AND stream_ordering < ? AND contains_url = ? AND outlier = ? @@ -619,7 +619,7 @@ class RoomStore(RoomWorkerStore, SearchStore): if matches: hostname = matches.group(1) media_id = matches.group(2) - if hostname == self.hostname: + if hostname == self.hs.hostname: local_media_mxcs.append(media_id) else: remote_media_mxcs.append((hostname, media_id)) |