Skip to content

Commit e5a02fa

Browse files
author
g.zinovev
committed
Address maintainer feedback: [fixed optional values]
1 parent 7007eca commit e5a02fa

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

telebot/types.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6703,13 +6703,14 @@ def __init__(self, type, media, caption=None, parse_mode=None, caption_entities=
67036703
self.caption_entities: Optional[List[MessageEntity]] = caption_entities
67046704
self.thumbnail: Optional[Union[str, InputFile]] = thumbnail
67056705

6706-
if isinstance(self.thumbnail, InputFile):
6707-
self._thumbnail_name = service_utils.generate_random_token()
6708-
self._thumbnail_dic = 'attach://{0}'.format(self._thumbnail_name)
6709-
else:
6706+
if service_utils.is_string(self.thumbnail):
67106707
self._thumbnail_name = ''
67116708
self._thumbnail_dic = self.thumbnail
67126709

6710+
else:
6711+
self._thumbnail_name = service_utils.generate_random_token()
6712+
self._thumbnail_dic = 'attach://{0}'.format(self._thumbnail_name)
6713+
67136714
if service_utils.is_string(self.media):
67146715
self._media_name = ''
67156716
self._media_dic = self.media
@@ -6721,7 +6722,9 @@ def to_json(self):
67216722
return json.dumps(self.to_dict())
67226723

67236724
def to_dict(self):
6724-
json_dict = {'type': self.type, 'media': self._media_dic, 'thumbnail': self._thumbnail_dic}
6725+
json_dict = {'type': self.type, 'media': self._media_dic}
6726+
if self._thumbnail_dic:
6727+
json_dict['thumbnail'] = self._thumbnail_dic
67256728
if self.caption:
67266729
json_dict['caption'] = self.caption
67276730
if self.parse_mode:
@@ -6736,8 +6739,12 @@ def convert_input_media(self):
67366739
"""
67376740
if service_utils.is_string(self.media):
67386741
return self.to_json(), None
6742+
6743+
media_dict = {self._media_name: self.media}
6744+
if self._thumbnail_name:
6745+
media_dict[self._thumbnail_name] = self.thumbnail
67396746

6740-
return self.to_json(), {self._media_name: self.media, self._thumbnail_name: self.thumbnail}
6747+
return self.to_json(), media_dict
67416748

67426749

67436750
class InputMediaPhoto(InputMedia):

0 commit comments

Comments
 (0)