fix remote thumbnails?

Author: richvdh

synapse/rest/media/v1/media_storage.py

@@ -143,12 +143,9 @@ async def fetch_media(self, file_info: FileInfo) -> Optional[Responder]:
         """
 
         path = self._file_info_to_path(file_info)
-        local_path = os.path.join(self.local_media_directory, path)
-        if os.path.exists(local_path):
-            return FileResponder(open(local_path, "rb"))
 
-        # Fallback for paths without method names
-        # Should be removed in the future
+        # fallback for remote thumbnails with no method in the filename
+        legacy_path = None
         if file_info.thumbnail and file_info.server_name:
             legacy_path = self.filepaths.remote_media_thumbnail_rel_legacy(
                 server_name=file_info.server_name,
@@ -157,15 +154,34 @@ async def fetch_media(self, file_info: FileInfo) -> Optional[Responder]:
                 height=file_info.thumbnail_height,
                 content_type=file_info.thumbnail_type,
             )
+
+        local_path = os.path.join(self.local_media_directory, path)
+        if os.path.exists(local_path):
+            logger.debug("responding with local file %s", local_path)
+            return FileResponder(open(local_path, "rb"))
+
+        if legacy_path:
+            logger.debug(
+                "local file %s did not exist; checking legacy name", local_path
+            )
             legacy_local_path = os.path.join(self.local_media_directory, legacy_path)
             if os.path.exists(legacy_local_path):
+                logger.debug("responding with local file %s", legacy_local_path)
                 return FileResponder(open(legacy_local_path, "rb"))
 
         for provider in self.storage_providers:
             res = await provider.fetch(path, file_info)  # type: Any
             if res:
                 logger.debug("Streaming %s from %s", path, provider)
                 return res
+            if legacy_path:
+                logger.debug(
+                    "Provider %s did not find %s; checking legacy name", provider, path
+                )
+                res = await provider.fetch(legacy_path, file_info)
+                if res:
+                    logger.debug("Streaming %s from %s", legacy_path, provider)
+                    return res
 
         return None