Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs 

Use the right path for url_preview thumbnails
This commit is contained in:
Richard van der Hoff 2018-01-19 18:57:15 +00:00 committed by GitHub
parent cd871a3057 ad7ec63d08
commit b0d9e633ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/rest/media/v1/media_storage.py
View File

@ -164,6 +164,14 @@ class MediaStorage(object):
str str
""" """
if file_info.url_cache: if file_info.url_cache:
if file_info.thumbnail:
return self.filepaths.url_cache_thumbnail_rel(
media_id=file_info.file_id,
width=file_info.thumbnail_width,
height=file_info.thumbnail_height,
content_type=file_info.thumbnail_type,
method=file_info.thumbnail_method,
)
return self.filepaths.url_cache_filepath_rel(file_info.file_id) return self.filepaths.url_cache_filepath_rel(file_info.file_id)
if file_info.server_name: if file_info.server_name: