Skip to content

Commit e7b4e95

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 99f6829 + 85ffe99 commit e7b4e95

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

‎telebot/__init__.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ def get_user_profile_photos(self, user_id, offset=None, limit=None):
181181
result = apihelper.get_user_profile_photos(self.token, user_id, offset, limit)
182182
return types.UserProfilePhotos.de_json(result)
183183

184-
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
184+
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None,
185+
parse_mode=None):
185186
"""
186187
Use this method to send text messages.
187188
@@ -193,11 +194,12 @@ def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_me
193194
:param disable_web_page_preview:
194195
:param reply_to_message_id:
195196
:param reply_markup:
197+
:param parse_mode:
196198
:return: API reply.
197199
"""
198200
return types.Message.de_json(
199201
apihelper.send_message(self.token, chat_id, text, disable_web_page_preview, reply_to_message_id,
200-
reply_markup))
202+
reply_markup, parse_mode))
201203

202204
def forward_message(self, chat_id, from_chat_id, message_id):
203205
"""

‎telebot/apihelper.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ def get_me(token):
6262
return _make_request(token, method_url)
6363

6464

65-
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
65+
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None,
66+
parse_mode=None):
6667
"""
6768
Use this method to send text messages. On success, the sent Message is returned.
6869
:param token:
@@ -81,6 +82,8 @@ def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_m
8182
payload['reply_to_message_id'] = reply_to_message_id
8283
if reply_markup:
8384
payload['reply_markup'] = _convert_markup(reply_markup)
85+
if parse_mode:
86+
payload['parse_mode'] = parse_mode
8487
return _make_request(token, method_url, params=payload, method='post')
8588

8689

0 commit comments

Comments
 (0)