From 82535cd6d9265765faed12c0736b028c5897749d Mon Sep 17 00:00:00 2001 From: Meysam <39514244+meybj@users.noreply.github.com> Date: Wed, 29 Mar 2023 22:54:13 +0330 Subject: [PATCH 1/2] Fixed guess_mime_type --- pyrogram/methods/messages/edit_message_media.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyrogram/methods/messages/edit_message_media.py b/pyrogram/methods/messages/edit_message_media.py index 5a34f13875..7aeb220bc2 100644 --- a/pyrogram/methods/messages/edit_message_media.py +++ b/pyrogram/methods/messages/edit_message_media.py @@ -124,7 +124,7 @@ async def edit_message_media( raw.functions.messages.UploadMedia( peer=await self.resolve_peer(chat_id), media=raw.types.InputMediaUploadedDocument( - mime_type=self.guess_mime_type(media.media) or "video/mp4", + mime_type=self.guess_mime_type(file_name or media.media.name) or "video/mp4", thumb=await self.save_file(media.thumb), spoiler=media.has_spoiler, file=await self.save_file(media.media), @@ -164,7 +164,7 @@ async def edit_message_media( raw.functions.messages.UploadMedia( peer=await self.resolve_peer(chat_id), media=raw.types.InputMediaUploadedDocument( - mime_type=self.guess_mime_type(media.media) or "audio/mpeg", + mime_type=self.guess_mime_type(file_name or media.media.name) or "audio/mpeg", thumb=await self.save_file(media.thumb), file=await self.save_file(media.media), attributes=[ @@ -200,7 +200,7 @@ async def edit_message_media( raw.functions.messages.UploadMedia( peer=await self.resolve_peer(chat_id), media=raw.types.InputMediaUploadedDocument( - mime_type=self.guess_mime_type(media.media) or "video/mp4", + mime_type=self.guess_mime_type(file_name or media.media.name) or "video/mp4", thumb=await self.save_file(media.thumb), spoiler=media.has_spoiler, file=await self.save_file(media.media), @@ -241,7 +241,7 @@ async def edit_message_media( raw.functions.messages.UploadMedia( peer=await self.resolve_peer(chat_id), media=raw.types.InputMediaUploadedDocument( - mime_type=self.guess_mime_type(media.media) or "application/zip", + mime_type=self.guess_mime_type(file_name or media.media.name) or "application/zip", thumb=await self.save_file(media.thumb), file=await self.save_file(media.media), attributes=[ From 0802f1ec716058ac7de1c4d56137f039411a77b9 Mon Sep 17 00:00:00 2001 From: Meysam <39514244+meybj@users.noreply.github.com> Date: Wed, 29 Mar 2023 22:57:00 +0330 Subject: [PATCH 2/2] Fixed caption removing when edit media, Added ByteIO for thumb --- pyrogram/types/input_media/input_media.py | 2 +- pyrogram/types/input_media/input_media_animation.py | 2 +- pyrogram/types/input_media/input_media_audio.py | 4 ++-- pyrogram/types/input_media/input_media_document.py | 4 ++-- pyrogram/types/input_media/input_media_photo.py | 2 +- pyrogram/types/input_media/input_media_video.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyrogram/types/input_media/input_media.py b/pyrogram/types/input_media/input_media.py index bd60aeb3e1..b5cd6557c4 100644 --- a/pyrogram/types/input_media/input_media.py +++ b/pyrogram/types/input_media/input_media.py @@ -37,7 +37,7 @@ class InputMedia(Object): def __init__( self, media: Union[str, BinaryIO], - caption: str = "", + caption: str = None, parse_mode: str = None, caption_entities: List[MessageEntity] = None ): diff --git a/pyrogram/types/input_media/input_media_animation.py b/pyrogram/types/input_media/input_media_animation.py index 2e91a2147b..435d39204f 100644 --- a/pyrogram/types/input_media/input_media_animation.py +++ b/pyrogram/types/input_media/input_media_animation.py @@ -68,7 +68,7 @@ def __init__( self, media: Union[str, BinaryIO], thumb: str = None, - caption: str = "", + caption: Union[str, BinaryIO] = None, parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List[MessageEntity] = None, width: int = 0, diff --git a/pyrogram/types/input_media/input_media_audio.py b/pyrogram/types/input_media/input_media_audio.py index cc91e7bd5c..48f81fda13 100644 --- a/pyrogram/types/input_media/input_media_audio.py +++ b/pyrogram/types/input_media/input_media_audio.py @@ -66,8 +66,8 @@ class InputMediaAudio(InputMedia): def __init__( self, media: Union[str, BinaryIO], - thumb: str = None, - caption: str = "", + thumb: Union[str, BinaryIO] = None, + caption: str = None, parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List[MessageEntity] = None, duration: int = 0, diff --git a/pyrogram/types/input_media/input_media_document.py b/pyrogram/types/input_media/input_media_document.py index 3e4d510b95..71eaa4b949 100644 --- a/pyrogram/types/input_media/input_media_document.py +++ b/pyrogram/types/input_media/input_media_document.py @@ -55,8 +55,8 @@ class InputMediaDocument(InputMedia): def __init__( self, media: Union[str, BinaryIO], - thumb: str = None, - caption: str = "", + thumb: Union[str, BinaryIO] = None, + caption: str = None, parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List[MessageEntity] = None ): diff --git a/pyrogram/types/input_media/input_media_photo.py b/pyrogram/types/input_media/input_media_photo.py index f4fd0e0305..1f05deef27 100644 --- a/pyrogram/types/input_media/input_media_photo.py +++ b/pyrogram/types/input_media/input_media_photo.py @@ -53,7 +53,7 @@ class InputMediaPhoto(InputMedia): def __init__( self, media: Union[str, BinaryIO], - caption: str = "", + caption: str = None, parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List[MessageEntity] = None, has_spoiler: bool = None diff --git a/pyrogram/types/input_media/input_media_video.py b/pyrogram/types/input_media/input_media_video.py index ab1823d339..bf2e868532 100644 --- a/pyrogram/types/input_media/input_media_video.py +++ b/pyrogram/types/input_media/input_media_video.py @@ -71,8 +71,8 @@ class InputMediaVideo(InputMedia): def __init__( self, media: Union[str, BinaryIO], - thumb: str = None, - caption: str = "", + thumb: Union[str, BinaryIO] = None, + caption: str = None, parse_mode: Optional["enums.ParseMode"] = None, caption_entities: List[MessageEntity] = None, width: int = 0,