summary refs log tree commit diff
path: root/synapse/rest/media
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-12 15:38:06 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-12 15:38:06 +0000
commit21bf87a146e54d9c111abb6f39a1bcbdc0563df2 (patch)
treee98bf4d1bcde3194c2e92863113b1194ffaacd86 /synapse/rest/media
parentMerge pull request #2774 from matrix-org/erikj/synctl (diff)
downloadsynapse-21bf87a146e54d9c111abb6f39a1bcbdc0563df2.tar.xz
Reinstate media download on thumbnail request
We need to actually download the remote media when we get a request for a
thumbnail.
Diffstat (limited to 'synapse/rest/media')
-rw-r--r--synapse/rest/media/v1/thumbnail_resource.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py
index 70dbf7f5c9..53e48aba22 100644
--- a/synapse/rest/media/v1/thumbnail_resource.py
+++ b/synapse/rest/media/v1/thumbnail_resource.py
@@ -198,6 +198,11 @@ class ThumbnailResource(Resource):
     @defer.inlineCallbacks
     def _respond_remote_thumbnail(self, request, server_name, media_id, width,
                                   height, method, m_type):
+        # TODO: Don't download the whole remote file
+        # We should proxy the thumbnail from the remote server instead of
+        # downloading the remote file and generating our own thumbnails.
+        yield self.media_repo.get_remote_media(server_name, media_id)
+
         thumbnail_infos = yield self.store.get_remote_media_thumbnails(
             server_name, media_id,
         )