summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-04-26 12:02:40 +0100
committerGitHub <noreply@github.com>2018-04-26 12:02:40 +0100
commit0ced8b5b47ccfae29c2a033c0199ebf4e88c832e (patch)
tree4ce6b515727f08e44de301a0f4071b7122816952 /synapse
parentMerge pull request #3130 from matrix-org/erikj/fix_quarantine_room (diff)
parentFix media admin APIs (diff)
downloadsynapse-0ced8b5b47ccfae29c2a033c0199ebf4e88c832e.tar.xz
Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api
Fix media admin APIs
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/room.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index c0c01bcfbe..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))
 
@@ -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))