Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-05 04:04:59 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix thumbnailing remote files

Browse source
This commit is contained in:
Erik Johnston 2018-01-16 11:06:42 +00:00
parent 1159abbdd2
commit a4c5e4a645
2 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/rest/media/v1/thumbnail_resource.py
View file

@ -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,