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

Merge pull request #410 from 0xVK/fix-exec-handlers

Browse Source 
#405 - Message has callback function but it exec command handlers too.
This commit is contained in:
FrankWang 2017-11-04 21:28:21 +08:00 committed by GitHub
commit c327be5a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
telebot/__init__.py
View File

@ -1259,10 +1259,13 @@ class TeleBot:
def _notify_command_handlers(self, handlers, new_messages): def _notify_command_handlers(self, handlers, new_messages):
for message in new_messages: for message in new_messages:
for message_handler in handlers: # if message has next step handler, dont exec command handlers
if self._test_message_handler(message_handler, message): if (isinstance(message, types.CallbackQuery)) or \
self._exec_task(message_handler['function'], message) (isinstance(message, types.Message) and (message.chat.id not in self.message_subscribers_next_step)):
break for message_handler in handlers:
if self._test_message_handler(message_handler, message):
self._exec_task(message_handler['function'], message)
break
class AsyncTeleBot(TeleBot): class AsyncTeleBot(TeleBot):