Skip to content

Commit f21e681

Browse files
Fix inconsistent parts and bugs
1 parent 2621a56 commit f21e681

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

telebot/apihelper.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,11 +484,11 @@ def send_checklist(
484484
payload['disable_notification'] = disable_notification
485485
if protect_content is not None:
486486
payload['protect_content'] = protect_content
487-
if message_effect_id is not None:
487+
if message_effect_id:
488488
payload['message_effect_id'] = message_effect_id
489-
if reply_parameters is not None:
489+
if reply_parameters:
490490
payload['reply_parameters'] = reply_parameters.to_json()
491-
if reply_markup is not None:
491+
if reply_markup:
492492
payload['reply_markup'] = _convert_markup(reply_markup)
493493
return _make_request(token, method_url, params=payload)
494494

@@ -499,7 +499,7 @@ def edit_message_checklist(
499499
):
500500
method_url = r'editMessageChecklist'
501501
payload = {'chat_id': chat_id, 'message_id': message_id, 'checklist': checklist, 'business_connection_id': business_connection_id}
502-
if reply_markup is not None:
502+
if reply_markup:
503503
payload['reply_markup'] = _convert_markup(reply_markup)
504504
return _make_request(token, method_url, params=payload)
505505

telebot/asyncio_helper.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,11 @@ async def send_checklist(
488488
payload['disable_notification'] = disable_notification
489489
if protect_content is not None:
490490
payload['protect_content'] = protect_content
491-
if message_effect_id is not None:
491+
if message_effect_id:
492492
payload['message_effect_id'] = message_effect_id
493-
if reply_parameters is not None:
493+
if reply_parameters:
494494
payload['reply_parameters'] = reply_parameters.to_json()
495-
if reply_markup is not None:
495+
if reply_markup:
496496
payload['reply_markup'] = _convert_markup(reply_markup)
497497
return await _process_request(token, method_url, params=payload)
498498

@@ -503,7 +503,7 @@ async def edit_message_checklist(
503503
):
504504
method_url = r'editMessageChecklist'
505505
payload = {'chat_id': chat_id, 'message_id': message_id, 'checklist': checklist, 'business_connection_id': business_connection_id}
506-
if reply_markup is not None:
506+
if reply_markup:
507507
payload['reply_markup'] = await _convert_markup(reply_markup)
508508
return await _process_request(token, method_url, params=payload)
509509

telebot/types.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8889,6 +8889,10 @@ def de_json(cls, json_string):
88898889
obj['poll'] = Poll.de_json(obj['poll'])
88908890
if 'venue' in obj:
88918891
obj['venue'] = Venue.de_json(obj['venue'])
8892+
if 'paid_media' in obj:
8893+
obj['paid_media'] = PaidMediaInfo.de_json(obj['paid_media'])
8894+
if 'checklist' in obj:
8895+
obj['checklist'] = Checklist.de_json(obj['checklist'])
88928896
return cls(**obj)
88938897

88948898
def __init__(
@@ -12523,7 +12527,7 @@ def de_json(cls, json_string):
1252312527
if json_string is None: return None
1252412528
obj = cls.check_json(json_string)
1252512529
if 'text_entities' in obj:
12526-
obj['text_entities'] = [MessageEntity.de_json(entity) for entity in obj['text_entities']]
12530+
obj['text_entities'] = Message.parse_entities(obj['text_entities'])
1252712531
if 'completed_by_user' in obj:
1252812532
obj['completed_by_user'] = User.de_json(obj['completed_by_user'])
1252912533
return cls(**obj)
@@ -12552,8 +12556,8 @@ class Checklist(JsonDeserializable):
1255212556
:return: Instance of the class
1255312557
:rtype: :class:`Checklist`
1255412558
"""
12555-
def __init__(self, title: str, tasks: List[ChecklistTask],
12556-
title_entities: Optional[List[MessageEntity]] = None,
12559+
def __init__(self, title: str,title_entities: Optional[List[MessageEntity]] = None,
12560+
tasks: List[ChecklistTask] = None,
1255712561
others_can_add_tasks: Optional[bool] = None,
1255812562
others_can_mark_tasks_as_done: Optional[bool] = None, **kwargs):
1255912563
self.title: str = title
@@ -12567,7 +12571,7 @@ def de_json(cls, json_string):
1256712571
if json_string is None: return None
1256812572
obj = cls.check_json(json_string)
1256912573
if 'title_entities' in obj:
12570-
obj['title_entities'] = [MessageEntity.de_json(entity) for entity in obj['title_entities']]
12574+
obj['title_entities'] = Message.parse_entities(obj['title_entities'])
1257112575
if 'tasks' in obj:
1257212576
obj['tasks'] = [ChecklistTask.de_json(task) for task in obj['tasks']]
1257312577
return cls(**obj)
@@ -12608,9 +12612,9 @@ def to_dict(self):
1260812612
'id': self.id,
1260912613
'text': self.text
1261012614
}
12611-
if self.parse_mode is not None:
12615+
if self.parse_mode:
1261212616
data['parse_mode'] = self.parse_mode
12613-
if self.text_entities is not None:
12617+
if self.text_entities:
1261412618
data['text_entities'] = [entity.to_dict() for entity in self.text_entities]
1261512619
return data
1261612620

@@ -12641,10 +12645,9 @@ class InputChecklist(JsonSerializable):
1264112645
:return: Instance of the class
1264212646
:rtype: :class:`InputChecklist`
1264312647
"""
12644-
def __init__(self, title: str, tasks: List[InputChecklistTask],
12645-
parse_mode: Optional[str] = None,
12648+
def __init__(self, title: str,parse_mode: Optional[str] = None,
1264612649
title_entities: Optional[List[MessageEntity]] = None,
12647-
others_can_add_tasks: Optional[bool] = None,
12650+
tasks: List[InputChecklistTask], others_can_add_tasks: Optional[bool] = None,
1264812651
others_can_mark_tasks_as_done: Optional[bool] = None, **kwargs):
1264912652
self.title: str = title
1265012653
self.parse_mode: Optional[str] = parse_mode
@@ -12661,9 +12664,9 @@ def to_dict(self):
1266112664
'title': self.title,
1266212665
'tasks': [task.to_dict() for task in self.tasks]
1266312666
}
12664-
if self.parse_mode is not None:
12667+
if self.parse_mode:
1266512668
data['parse_mode'] = self.parse_mode
12666-
if self.title_entities is not None:
12669+
if self.title_entities:
1266712670
data['title_entities'] = [entity.to_dict() for entity in self.title_entities]
1266812671
if self.others_can_add_tasks is not None:
1266912672
data['others_can_add_tasks'] = self.others_can_add_tasks

0 commit comments

Comments
 (0)