From f873658aac3c001818d2a18fcbb740f1fe8dadd4 Mon Sep 17 00:00:00 2001 From: eternnoir Date: Thu, 14 Apr 2016 15:06:46 +0800 Subject: [PATCH] Fix edit message error. --- telebot/__init__.py | 7 ++++--- telebot/apihelper.py | 6 ++++-- tests/test_telebot.py | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/telebot/__init__.py b/telebot/__init__.py index 2ecbe71..f75004e 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -460,10 +460,11 @@ class TeleBot: def answer_callback_query(self, callback_query_id, text=None, show_alert=None): return apihelper.answer_callback_query(self.token, callback_query_id, text, show_alert) - def edit_message_text(self, chat_id, text, message_id=None, inline_message_id=None, parse_mode=None, + def edit_message_text(self, text, chat_id=None, message_id=None, inline_message_id=None, parse_mode=None, disable_web_page_preview=None, reply_markup=None): - return types.Message.de_json(apihelper.edit_message_text(self.token, chat_id, text, message_id, inline_message_id, parse_mode, - disable_web_page_preview, reply_markup)) + return types.Message.de_json( + apihelper.edit_message_text(self.token, text, chat_id, message_id, inline_message_id, parse_mode, + disable_web_page_preview, reply_markup)) def reply_to(self, message, text, **kwargs): """ diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 4337b92..36d97e7 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -313,10 +313,12 @@ def unban_chat_member(token, chat_id, user_id): # Updating messages -def edit_message_text(token, chat_id, text, message_id=None, inline_message_id=None, parse_mode=None, +def edit_message_text(token, text, chat_id=None, message_id=None, inline_message_id=None, parse_mode=None, disable_web_page_preview=None, reply_markup=None): method_url = r'editMessageText' - payload = {'chat_id': chat_id, 'text': text} + payload = {'text': text} + if chat_id: + payload['chat_id'] = chat_id if message_id: payload['message_id'] = message_id if inline_message_id: diff --git a/tests/test_telebot.py b/tests/test_telebot.py index 9e70e84..3c01125 100644 --- a/tests/test_telebot.py +++ b/tests/test_telebot.py @@ -328,7 +328,7 @@ class TestTeleBot: def test_edit_message_text(self): tb = telebot.TeleBot(TOKEN) msg = tb.send_message(CHAT_ID, 'Test') - new_msg = tb.edit_message_text(CHAT_ID, 'Edit test', message_id=msg.message_id) + new_msg = tb.edit_message_text('Edit test', chat_id=CHAT_ID, message_id=msg.message_id) assert new_msg.text == 'Edit test' def create_text_message(self, text):