diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-16 11:06:42 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-16 11:37:50 +0000 |
| commit | a4c5e4a6451dfc7b378c10b916635de6bdafa80a (patch) | |
| tree | 069a39aed65dfefa54aed937d987ef4b2f638cbc /synapse/rest/media/v1/thumbnail_resource.py | |
| parent | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor (diff) | |
| download | synapse-a4c5e4a6451dfc7b378c10b916635de6bdafa80a.tar.xz | |
Fix thumbnailing remote files
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
| -rw-r--r-- | synapse/rest/media/v1/thumbnail_resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py index 835540c3dd..70cea7782e 100644 --- a/synapse/rest/media/v1/thumbnail_resource.py +++ b/synapse/rest/media/v1/thumbnail_resource.py @@ -165,7 +165,7 @@ class ThumbnailResource(Resource): def _select_or_generate_remote_thumbnail(self, request, server_name, media_id, desired_width, desired_height, desired_method, desired_type): - media_info = yield self.media_repo.get_remote_media(server_name, media_id) + media_info = yield self.media_repo.get_remote_media_info(server_name, media_id) thumbnail_infos = yield self.store.get_remote_media_thumbnails( server_name, media_id, @@ -216,7 +216,7 @@ class ThumbnailResource(Resource): # 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) + yield self.media_repo.get_remote_media_info(server_name, media_id) thumbnail_infos = yield self.store.get_remote_media_thumbnails( server_name, media_id, |