OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Return a 404 if we don't have the original file

pull/9438/head
Erik Johnston 2021-02-19 10:46:18 +00:00
parent 2d577283ab
commit 3d2acc930f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ class MediaStorage:
await consumer.wait() await consumer.wait()
return local_path return local_path
raise Exception("file could not be found") raise NotFoundError()
def _file_info_to_path(self, file_info: FileInfo) -> str: def _file_info_to_path(self, file_info: FileInfo) -> str:
"""Converts file_info into a relative path. """Converts file_info into a relative path.

7
synapse/rest/media/v1/thumbnail_resource.py
View File

@ -340,6 +340,13 @@ class ThumbnailResource(DirectServeJsonResource):
# width/height/method so we can just call the "generate exact" # width/height/method so we can just call the "generate exact"
# methods. # methods.
# First let's check that we do actually have the original image
# still. This will throw a 404 if we don't.
# TODO: We should refetch the thumbnails for remote media.
await self.media_storage.ensure_media_is_in_local_cache(
FileInfo(server_name, file_id, url_cache=url_cache)
)
if server_name: if server_name:
await self.media_repo.generate_remote_exact_thumbnail( await self.media_repo.generate_remote_exact_thumbnail(
server_name, server_name,