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

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
eternnoir
2015-09-09 09:34:13 +08:00
2 changed files with 8 additions and 3 deletions

View File

@@ -62,7 +62,8 @@ def get_me(token):
return _make_request(token, method_url)
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None,
parse_mode=None):
"""
Use this method to send text messages. On success, the sent Message is returned.
:param token:
@@ -81,6 +82,8 @@ def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_m
payload['reply_to_message_id'] = reply_to_message_id
if reply_markup:
payload['reply_markup'] = _convert_markup(reply_markup)
if parse_mode:
payload['parse_mode'] = parse_mode
return _make_request(token, method_url, params=payload, method='post')