Remove webp conversion
This commit is contained in:
@@ -229,6 +229,14 @@ class PortalTelegram(BasePortal, ABC):
|
|||||||
# Elements only support images as stickers, so send animated webm stickers as m.video
|
# Elements only support images as stickers, so send animated webm stickers as m.video
|
||||||
if attrs.is_sticker and file.mime_type.startswith("image/"):
|
if attrs.is_sticker and file.mime_type.startswith("image/"):
|
||||||
event_type = EventType.STICKER
|
event_type = EventType.STICKER
|
||||||
|
# Tell clients to render the stickers as 256x256 if they're bigger
|
||||||
|
if info.width > 256 or info.height > 256:
|
||||||
|
if info.width > info.height:
|
||||||
|
info.height = int(info.height / (info.width / 256))
|
||||||
|
info.width = 256
|
||||||
|
else:
|
||||||
|
info.width = int(info.width / (info.height / 256))
|
||||||
|
info.height = 256
|
||||||
content = MediaMessageEventContent(
|
content = MediaMessageEventContent(
|
||||||
body=name or "unnamed file", info=info, relates_to=relates_to,
|
body=name or "unnamed file", info=info, relates_to=relates_to,
|
||||||
external_url=self._get_external_url(evt),
|
external_url=self._get_external_url(evt),
|
||||||
|
|||||||
@@ -222,9 +222,9 @@ async def _unlocked_transfer_file_to_matrix(client: MautrixTelegramClient, inten
|
|||||||
|
|
||||||
image_converted = False
|
image_converted = False
|
||||||
# A weird bug in alpine/magic makes it return application/octet-stream for gzips...
|
# A weird bug in alpine/magic makes it return application/octet-stream for gzips...
|
||||||
is_tgs = (mime_type == "application/gzip" or (mime_type == "application/octet-stream"
|
is_tgs = (mime_type == "application/gzip"
|
||||||
and magic.from_buffer(file).startswith(
|
or (mime_type == "application/octet-stream"
|
||||||
"gzip")))
|
and magic.from_buffer(file).startswith("gzip")))
|
||||||
if is_sticker and tgs_convert and is_tgs:
|
if is_sticker and tgs_convert and is_tgs:
|
||||||
converted_anim = await convert_tgs_to(file, tgs_convert["target"],
|
converted_anim = await convert_tgs_to(file, tgs_convert["target"],
|
||||||
**tgs_convert["args"])
|
**tgs_convert["args"])
|
||||||
@@ -234,14 +234,6 @@ async def _unlocked_transfer_file_to_matrix(client: MautrixTelegramClient, inten
|
|||||||
image_converted = mime_type != "application/gzip"
|
image_converted = mime_type != "application/gzip"
|
||||||
thumbnail = None
|
thumbnail = None
|
||||||
|
|
||||||
if mime_type == "image/webp":
|
|
||||||
new_mime_type, file, width, height = convert_image(
|
|
||||||
file, source_mime="image/webp", target_type="png",
|
|
||||||
thumbnail_to=(256, 256) if is_sticker else None)
|
|
||||||
image_converted = new_mime_type != mime_type
|
|
||||||
mime_type = new_mime_type
|
|
||||||
thumbnail = None
|
|
||||||
|
|
||||||
decryption_info = None
|
decryption_info = None
|
||||||
upload_mime_type = mime_type
|
upload_mime_type = mime_type
|
||||||
if encrypt and encrypt_attachment:
|
if encrypt and encrypt_attachment:
|
||||||
|
|||||||
@@ -7,9 +7,6 @@ cchardet
|
|||||||
aiodns
|
aiodns
|
||||||
brotli
|
brotli
|
||||||
|
|
||||||
#/webp_convert
|
|
||||||
pillow>=4,<9
|
|
||||||
|
|
||||||
#/qr_login
|
#/qr_login
|
||||||
pillow>=4,<9
|
pillow>=4,<9
|
||||||
qrcode>=6,<7
|
qrcode>=6,<7
|
||||||
|
|||||||
Reference in New Issue
Block a user