From 311fe6378c0d17bb6989f6604d0ac3ebcbfae47b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 31 Jan 2021 21:05:41 +0200 Subject: [PATCH] Fix webp thumbnailing --- synapse/config/repository.py | 3 ++- synapse/rest/media/v1/thumbnailer.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 850ac3ebd..cf5c2de4f 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -72,8 +72,9 @@ def parse_thumbnail_requirements(thumbnail_sizes): method = size["method"] jpeg_thumbnail = ThumbnailRequirement(width, height, method, "image/jpeg") png_thumbnail = ThumbnailRequirement(width, height, method, "image/png") + webp_thumbnail = ThumbnailRequirement(width, height, method, "image/webp") requirements.setdefault("image/jpeg", []).append(jpeg_thumbnail) - requirements.setdefault("image/webp", []).append(jpeg_thumbnail) + requirements.setdefault("image/webp", []).append(webp_thumbnail) requirements.setdefault("image/gif", []).append(png_thumbnail) requirements.setdefault("image/png", []).append(png_thumbnail) return { diff --git a/synapse/rest/media/v1/thumbnailer.py b/synapse/rest/media/v1/thumbnailer.py index 07903e401..ce3ee8ca2 100644 --- a/synapse/rest/media/v1/thumbnailer.py +++ b/synapse/rest/media/v1/thumbnailer.py @@ -39,7 +39,7 @@ class ThumbnailError(Exception): class Thumbnailer: - FORMATS = {"image/jpeg": "JPEG", "image/png": "PNG"} + FORMATS = {"image/jpeg": "JPEG", "image/png": "PNG", "image/webp": "WEBP"} def __init__(self, input_path: str): try: