Fixes from review

eternnoir · Jul 4, 2024 · 01f9a28 · 01f9a28
1 parent 5117807
commit 01f9a28
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/telebot/apihelper.py b/telebot/apihelper.py
@@ -2145,7 +2145,7 @@ def convert_input_media_array(array):
     media = []
     files = {}
     for input_media in array:
-        if isinstance(input_media, types.InputMedia):
+        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://', '')

diff --git a/telebot/asyncio_helper.py b/telebot/asyncio_helper.py
@@ -2108,7 +2108,7 @@ async def convert_input_media_array(array):
     media = []
     files = {}
     for input_media in array:
-        if isinstance(input_media, types.InputMedia):
+        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://', '')

diff --git a/telebot/types.py b/telebot/types.py
@@ -6737,7 +6737,7 @@ def to_dict(self):
             ret['height'] = self.height
         if self.duration:
             ret['duration'] = self.duration
-        if self.supports_streaming:
+        if self.supports_streaming is not None:
             ret['supports_streaming'] = self.supports_streaming
         if self.has_spoiler is not None:
             ret['has_spoiler'] = self.has_spoiler
@@ -10569,13 +10569,21 @@ def __init__(self, type, media, **kwargs):
         self.type = type
         self.media = media
 
+        if service_utils.is_string(self.media):
+            self._media_name = ''
+            self._media_dic = self.media
+        else:
+            self._media_name = service_utils.generate_random_token()
+            self._media_dic = 'attach://{0}'.format(self._media_name)
+
     def to_json(self):
         return json.dumps(self.to_dict())
 
     def to_dict(self):
-        data = {}
-        data['type'] = str(self.type)
-        data['media'] = str(self.media)
+        data = {
+            'type': self.type,
+            'media': self._media_dic
+        }
         return data
 
 class InputPaidMediaPhoto(InputPaidMedia):
@@ -10648,14 +10656,14 @@ def __init__(self, media, thumbnail=None, width=None, height=None, duration=None
     def to_dict(self):
         data = super().to_dict()
         if self.thumbnail:
-            data['thumbnail'] = self.thumbnail.to_dict()
+            data['thumbnail'] = self.thumbnail
         if self.width:
             data['width'] = self.width
         if self.height:
             data['height'] = self.height
         if self.duration:
             data['duration'] = self.duration
-        if self.supports_streaming:
+        if self.supports_streaming is not None:
             data['supports_streaming'] = self.supports_streaming
         return data