mirror of
https://github.com/eternnoir/pyTelegramBotAPI.git
synced 2023-08-10 21:12:57 +03:00
Merge pull request #1560 from coder2020official/master
Changed behaviour of default parse mode in sync and async telebot.
This commit is contained in:
commit
c63b0d6a3d
1
.gitignore
vendored
1
.gitignore
vendored
@ -64,6 +64,7 @@ testMain.py
|
|||||||
#VS Code
|
#VS Code
|
||||||
.vscode/
|
.vscode/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
*.code-workspace
|
||||||
|
|
||||||
# documentation
|
# documentation
|
||||||
_build/
|
_build/
|
||||||
|
@ -2510,6 +2510,8 @@ class TeleBot:
|
|||||||
if isinstance(question, types.Poll):
|
if isinstance(question, types.Poll):
|
||||||
raise RuntimeError("The send_poll signature was changed, please see send_poll function details.")
|
raise RuntimeError("The send_poll signature was changed, please see send_poll function details.")
|
||||||
|
|
||||||
|
explanation_parse_mode = self.parse_mode if (explanation_parse_mode is None) else explanation_parse_mode
|
||||||
|
|
||||||
return types.Message.de_json(
|
return types.Message.de_json(
|
||||||
apihelper.send_poll(
|
apihelper.send_poll(
|
||||||
self.token, chat_id,
|
self.token, chat_id,
|
||||||
|
@ -1674,6 +1674,8 @@ class AsyncTeleBot:
|
|||||||
:param protect_content:
|
:param protect_content:
|
||||||
:return: API reply.
|
:return: API reply.
|
||||||
"""
|
"""
|
||||||
|
parse_mode = self.parse_mode if (parse_mode is None) else parse_mode
|
||||||
|
|
||||||
return types.MessageID.de_json(
|
return types.MessageID.de_json(
|
||||||
await asyncio_helper.copy_message(self.token, chat_id, from_chat_id, message_id, caption, parse_mode, caption_entities,
|
await asyncio_helper.copy_message(self.token, chat_id, from_chat_id, message_id, caption, parse_mode, caption_entities,
|
||||||
disable_notification, reply_to_message_id, allow_sending_without_reply, reply_markup,
|
disable_notification, reply_to_message_id, allow_sending_without_reply, reply_markup,
|
||||||
@ -3112,6 +3114,8 @@ class AsyncTeleBot:
|
|||||||
if isinstance(question, types.Poll):
|
if isinstance(question, types.Poll):
|
||||||
raise RuntimeError("The send_poll signature was changed, please see send_poll function details.")
|
raise RuntimeError("The send_poll signature was changed, please see send_poll function details.")
|
||||||
|
|
||||||
|
explanation_parse_mode = self.parse_mode if (explanation_parse_mode is None) else explanation_parse_mode
|
||||||
|
|
||||||
return types.Message.de_json(
|
return types.Message.de_json(
|
||||||
await asyncio_helper.send_poll(
|
await asyncio_helper.send_poll(
|
||||||
self.token, chat_id,
|
self.token, chat_id,
|
||||||
|
@ -370,7 +370,8 @@ def quick_markup(values: Dict[str, Dict[str, Any]], row_width: int=2) -> types.I
|
|||||||
'switch_inline_query_current_chat': None,
|
'switch_inline_query_current_chat': None,
|
||||||
'callback_game': None,
|
'callback_game': None,
|
||||||
'pay': None,
|
'pay': None,
|
||||||
'login_url': None
|
'login_url': None,
|
||||||
|
'web_app': None
|
||||||
}
|
}
|
||||||
|
|
||||||
:param values: a dict containing all buttons to create in this format: {text: kwargs} {str:}
|
:param values: a dict containing all buttons to create in this format: {text: kwargs} {str:}
|
||||||
|
Loading…
Reference in New Issue
Block a user