mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Minor update to copyMessage

Browse Source
This commit is contained in:
Badiboy 2021-01-19 01:27:39 +03:00
parent 74fb8258b6
commit fdf2838669
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
telebot/__init__.py
View File

@ -753,8 +753,8 @@ class TeleBot:
apihelper.forward_message(self.token, chat_id, from_chat_id, message_id, disable_notification, timeout)) apihelper.forward_message(self.token, chat_id, from_chat_id, message_id, disable_notification, timeout))
def copy_message(self, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None, def copy_message(self, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None,
disable_notification=None, reply_to_message_id=None, allow_sending_without_reply=None, reply_markup=None, disable_notification=None, reply_to_message_id=None, allow_sending_without_reply=None,
timeout=None): reply_markup=None, timeout=None):
""" """
Use this method to copy messages of any kind. Use this method to copy messages of any kind.
:param chat_id: which chat to forward :param chat_id: which chat to forward
@ -772,8 +772,8 @@ class TeleBot:
""" """
return types.MessageID.de_json( return types.MessageID.de_json(
apihelper.copy_message(self.token, chat_id, from_chat_id, message_id, caption, parse_mode, caption_entities, apihelper.copy_message(self.token, chat_id, from_chat_id, message_id, caption, parse_mode, caption_entities,
reply_to_message_id, allow_sending_without_reply, reply_markup, disable_notification, reply_to_message_id, allow_sending_without_reply, reply_markup,
disable_notification, timeout)) timeout))
def delete_message(self, chat_id, message_id, timeout=None): def delete_message(self, chat_id, message_id, timeout=None):
""" """

21
telebot/apihelper.py
View File

@ -346,24 +346,24 @@ def forward_message(
def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None, def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_mode=None, caption_entities=None,
reply_to_message_id=None, allow_sending_without_reply=None, reply_markup=None, disable_notification=None, reply_to_message_id=None, allow_sending_without_reply=None,
disable_notification=None, timeout=None): reply_markup=None, timeout=None):
method_url = r'copyMessage' method_url = r'copyMessage'
payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id} payload = {'chat_id': chat_id, 'from_chat_id': from_chat_id, 'message_id': message_id}
if caption is not None: if caption is not None:
payload['caption'] = caption payload['caption'] = caption
if parse_mode is not None: if parse_mode:
payload['parse_mode'] = parse_mode payload['parse_mode'] = parse_mode
if caption_entities is not None: if caption_entities is not None:
payload['caption_entities'] = _convert_entites(caption_entities) payload['caption_entities'] = _convert_entites(caption_entities)
if reply_to_message_id is not None: if disable_notification is not None:
payload['disable_notification'] = disable_notification
if reply_to_message_id:
payload['reply_to_message_id'] = reply_to_message_id payload['reply_to_message_id'] = reply_to_message_id
if reply_markup is not None: if reply_markup is not None:
payload['reply_markup'] = _convert_markup(reply_markup) payload['reply_markup'] = _convert_markup(reply_markup)
if allow_sending_without_reply is not None: if allow_sending_without_reply is not None:
payload['allow_sending_without_reply'] = allow_sending_without_reply payload['allow_sending_without_reply'] = allow_sending_without_reply
if disable_notification is not None:
payload['disable_notification'] = disable_notification
if timeout: if timeout:
payload['connect-timeout'] = timeout payload['connect-timeout'] = timeout
return _make_request(token, method_url, params=payload) return _make_request(token, method_url, params=payload)
@ -1337,9 +1337,14 @@ def _convert_markup(markup):
def _convert_entites(entites): def _convert_entites(entites):
if isinstance(entites[0], types.JsonSerializable): if entites is None:
return None
elif len(entites) == 0:
return []
elif isinstance(entites[0], types.JsonSerializable):
return [entity.to_json() for entity in entites] return [entity.to_json() for entity in entites]
return entites else:
return entites
def convert_input_media(media): def convert_input_media(media):