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

Use the right path for url_preview thumbnails
7 years ago · b0d9e633ee
parent cd871a3057 ad7ec63d08
commit b0d9e633ee
1 changed files with 8 additions and 0 deletions
--- a/synapse/rest/media/v1/media_storage.py
+++ b/synapse/rest/media/v1/media_storage.py
@ -164,6 +164,14 @@ class MediaStorage(object):
            str
        """
        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)

        if file_info.server_name: