From 1ce8f08ff26191b45dc67db4db44322c0450f699 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 15 Apr 2018 20:58:41 +0300 Subject: [PATCH] Remove debug prints and don't set TelegramFile.was_converted if webp image wasn't converted --- mautrix_telegram/portal.py | 2 -- mautrix_telegram/util/file_transfer.py | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 4a4e9ea6..86f4fe6c 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -960,8 +960,6 @@ class Portal: attrs["sticker_alt"] = attr.alt elif isinstance(attr, DocumentAttributeVideo): attrs["width"], attrs["height"] = attr.w, attr.h - print([str(attr) for attr in attributes]) - print(attrs) return attrs @staticmethod diff --git a/mautrix_telegram/util/file_transfer.py b/mautrix_telegram/util/file_transfer.py index d2e00d8b..4a6c290e 100644 --- a/mautrix_telegram/util/file_transfer.py +++ b/mautrix_telegram/util/file_transfer.py @@ -143,10 +143,11 @@ async def transfer_file_to_matrix(db, client, intent, location, thumbnail=None, image_converted = False if mime_type == "image/webp": - mime_type, file, width, height = _convert_webp(file, to="png", thumbnail_to=( + new_mime_type, file, width, height = _convert_webp(file, to="png", thumbnail_to=( 256, 256) if is_sticker else None) + image_converted = new_mime_type != mime_type + mime_type = new_mime_type thumbnail = None - image_converted = True uploaded = await intent.upload_file(file, mime_type)