Types init alignment

telebot/__init__.py

@@ -75,7 +75,7 @@ class ExceptionHandler:
     Class for handling exceptions while Polling
     """
 
-    # noinspection PyMethodMayBeStatic,PyUnusedLocal
+    # noinspection PyMethodMayBeStatic,unused-parameter
     def handle(self, exception):
         return False
 
@@ -6017,7 +6017,7 @@ def edit_message_text(
 
 
     def edit_message_media(
-            self, media: Any, chat_id: Optional[Union[int, str]]=None,
+            self, media: types.InputMedia, chat_id: Optional[Union[int, str]]=None,
             message_id: Optional[int]=None,
             inline_message_id: Optional[str]=None,
             reply_markup: Optional[types.InlineKeyboardMarkup]=None,
@@ -6033,7 +6033,8 @@ def edit_message_media(
         Telegram documentation: https://core.telegram.org/bots/api#editmessagemedia
 
         :param media: A JSON-serialized object for a new media content of the message
-        :type media: :obj:`InputMedia`
+        :type media: :obj:`types.InputMedia`
+
         :param chat_id: Required if inline_message_id is not specified. Unique identifier for the target chat or username of the target channel (in the format @channelusername)
         :type chat_id: :obj:`int` or :obj:`str`
 

telebot/apihelper.py

@@ -3076,22 +3076,21 @@ def convert_input_media(media):
     return None, None
 
 
+# noinspection protected-member
 def convert_input_media_array(array):
     media = []
     files = {}
     for input_media in array:
         if isinstance(input_media, types.InputMedia) or isinstance(input_media, types.InputPaidMedia):
             media_dict = input_media.to_dict()
-            key = "x" # stub
-            if media_dict['media'].startswith('attach://'):
-                key = media_dict['media'].replace('attach://', '')
-                files[key] = input_media.media
-            if 'thumbnail' in media_dict:
-                thumbnail = media_dict['thumbnail']
-                if isinstance(thumbnail, types.InputFile):
-                    thumbnail_key = 'thumbnail_' + key  
-                    files[thumbnail_key] = thumbnail    
-                    media_dict['thumbnail'] = 'attach://' + thumbnail_key   
+            if ('media' in media_dict) and media_dict['media'].startswith('attach://'):
+                files[input_media._media_name] = input_media.media
+            if ('thumbnail' in media_dict) and media_dict['thumbnail'].startswith('attach://'):
+                files[input_media._thumbnail_name] = input_media.thumbnail
+            if ('cover' in media_dict) and media_dict['cover'].startswith('attach://'):
+                files[input_media._cover_name] = input_media.cover
+            if ('photo' in media_dict) and media_dict['photo'].startswith('attach://'):
+                files[input_media._photo_name] = input_media.photo
             media.append(media_dict)
     return json.dumps(media), files
 

telebot/async_telebot.py

@@ -7680,7 +7680,7 @@ async def edit_message_text(
         return types.Message.de_json(result)
 
     async def edit_message_media(
-            self, media: Any, chat_id: Optional[Union[int, str]]=None,
+            self, media: types.InputMedia, chat_id: Optional[Union[int, str]]=None,
             message_id: Optional[int]=None,
             inline_message_id: Optional[str]=None,
             reply_markup: Optional[types.InlineKeyboardMarkup]=None,
@@ -7696,7 +7696,8 @@ async def edit_message_media(
         Telegram documentation: https://core.telegram.org/bots/api#editmessagemedia
 
         :param media: A JSON-serialized object for a new media content of the message
-        :type media: :obj:`InputMedia`
+        :type media: :obj:`telebot.types.InputMedia`
+
         :param chat_id: Required if inline_message_id is not specified. Unique identifier for the target chat or username of the target channel (in the format @channelusername)
         :type chat_id: :obj:`int` or :obj:`str`
 

telebot/asyncio_helper.py

@@ -2965,19 +2965,17 @@ async def convert_input_media(media):
 async def convert_input_media_array(array):
     media = []
     files = {}
-    key = ""
     for input_media in array:
         if isinstance(input_media, types.InputMedia) or isinstance(input_media, types.InputPaidMedia):
             media_dict = input_media.to_dict()
-            if media_dict['media'].startswith('attach://'):
-                key = media_dict['media'].replace('attach://', '')
-                files[key] = input_media.media
-            if 'thumbnail' in media_dict:
-                thumbnail = media_dict['thumbnail']
-                if isinstance(thumbnail, types.InputFile):
-                    thumbnail_key = 'thumbnail_' + key  
-                    files[thumbnail_key] = thumbnail    
-                    media_dict['thumbnail'] = 'attach://' + thumbnail_key     
+            if ('media' in media_dict) and media_dict['media'].startswith('attach://'):
+                files[input_media._media_name] = input_media.media
+            if ('thumbnail' in media_dict) and media_dict['thumbnail'].startswith('attach://'):
+                files[input_media._thumbnail_name] = input_media.thumbnail
+            if ('cover' in media_dict) and media_dict['cover'].startswith('attach://'):
+                files[input_media._cover_name] = input_media.cover
+            if ('photo' in media_dict) and media_dict['photo'].startswith('attach://'):
+                files[input_media._photo_name] = input_media.photo
             media.append(media_dict)
     return json.dumps(media), files