diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-01-21 14:53:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 14:53:58 -0500 |
| commit | a7882f98874684969910d3a6ed7d85f99114cc45 (patch) | |
| tree | 212c188027151c242a29171550428d5158fa898b /synapse/rest/media/v1/_base.py | |
| parent | Align the directories linted in CI with the defaults in scripts-dev/lint.sh (... (diff) | |
| download | synapse-a7882f98874684969910d3a6ed7d85f99114cc45.tar.xz | |
Return a 404 if no valid thumbnail is found. (#9163)
If no thumbnail of the requested type exists, return a 404 instead of erroring. This doesn't quite match the spec (which does not define what happens if no thumbnail can be found), but is consistent with what Synapse already does.
Diffstat (limited to 'synapse/rest/media/v1/_base.py')
| -rw-r--r-- | synapse/rest/media/v1/_base.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py index 31a41e4a27..f71a03a12d 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py @@ -300,6 +300,7 @@ class FileInfo: thumbnail_height (int) thumbnail_method (str) thumbnail_type (str): Content type of thumbnail, e.g. image/png + thumbnail_length (int): The size of the media file, in bytes. """ def __init__( @@ -312,6 +313,7 @@ class FileInfo: thumbnail_height=None, thumbnail_method=None, thumbnail_type=None, + thumbnail_length=None, ): self.server_name = server_name self.file_id = file_id @@ -321,6 +323,7 @@ class FileInfo: self.thumbnail_height = thumbnail_height self.thumbnail_method = thumbnail_method self.thumbnail_type = thumbnail_type + self.thumbnail_length = thumbnail_length def get_filename_from_headers(headers: Dict[bytes, List[bytes]]) -> Optional[str]: |