Skip to content

Commit 5273513

Browse files
author
Max
committed
+ Don't check filters against NoneType values;
+ More flexibility for subclassing: - __exec_task is protected now(was private) - _test_message_handler and _test_filter are class members now(used to be static methods) + More flexibility on extention of message_handler(**kwargs for additional parameters)
1 parent 1b47e5c commit 5273513

1 file changed

Lines changed: 25 additions & 22 deletions

File tree

‎telebot/__init__.py‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def process_new_callback_query(self, new_callback_querys):
174174

175175
def __notify_update(self, new_messages):
176176
for listener in self.update_listener:
177-
self.__exec_task(listener, new_messages)
177+
self._exec_task(listener, new_messages)
178178

179179
def polling(self, none_stop=False, interval=0, timeout=20):
180180
"""
@@ -260,7 +260,7 @@ def __non_threaded_polling(self, none_stop=False, interval=0, timeout=3):
260260

261261
logger.info('Stopped polling.')
262262

263-
def __exec_task(self, task, *args, **kwargs):
263+
def _exec_task(self, task, *args, **kwargs):
264264
if self.threaded:
265265
self.worker_pool.put(task, *args, **kwargs)
266266
else:
@@ -643,7 +643,7 @@ def _notify_message_next_handler(self, new_messages):
643643
if chat_id in self.message_subscribers_next_step:
644644
handlers = self.message_subscribers_next_step[chat_id]
645645
for handler in handlers:
646-
self.__exec_task(handler, message)
646+
self._exec_task(handler, message)
647647
self.message_subscribers_next_step.pop(chat_id, None)
648648

649649
def _append_pre_next_step_handler(self):
@@ -660,7 +660,7 @@ def _build_handler_dict(self, handler, **filters):
660660
'filters': filters
661661
}
662662

663-
def message_handler(self, commands=None, regexp=None, func=None, content_types=['text']):
663+
def message_handler(self, commands=None, regexp=None, func=None, content_types=['text'], **kwargs):
664664
"""
665665
Message handler decorator.
666666
This decorator can be used to decorate functions that must handle certain types of messages.
@@ -695,7 +695,8 @@ def decorator(handler):
695695
commands=commands,
696696
regexp=regexp,
697697
func=func,
698-
content_types=content_types)
698+
content_types=content_types,
699+
**kwargs)
699700

700701
self.add_message_handler(handler_dict)
701702

@@ -706,13 +707,14 @@ def decorator(handler):
706707
def add_message_handler(self, handler_dict):
707708
self.message_handlers.append(handler_dict)
708709

709-
def edited_message_handler(self, commands=None, regexp=None, func=None, content_types=['text']):
710+
def edited_message_handler(self, commands=None, regexp=None, func=None, content_types=['text'], **kwargs):
710711
def decorator(handler):
711712
handler_dict = self._build_handler_dict(handler,
712713
commands=commands,
713714
regexp=regexp,
714715
func=func,
715-
content_types=content_types)
716+
content_types=content_types,
717+
**kwargs)
716718
self.add_edited_message_handler(handler_dict)
717719
return handler
718720

@@ -753,30 +755,31 @@ def decorator(handler):
753755
def add_callback_query_handler(self, handler_dict):
754756
self.callback_query_handlers.append(handler_dict)
755757

756-
@staticmethod
757-
def _test_message_handler(message_handler, message):
758+
def _test_message_handler(self, message_handler, message):
758759
for filter, filter_value in six.iteritems(message_handler['filters']):
759-
if not TeleBot._test_filter(filter, filter_value, message):
760+
if filter_value is None:
761+
continue
762+
763+
if not self._test_filter(filter, filter_value, message):
760764
return False
765+
761766
return True
762767

763-
@staticmethod
764-
def _test_filter(filter, filter_value, message):
765-
if filter == 'content_types':
766-
return message.content_type in filter_value
767-
if filter == 'regexp':
768-
return message.content_type == 'text' and re.search(filter_value, message.text)
769-
if filter == 'commands':
770-
return message.content_type == 'text' and util.extract_command(message.text) in filter_value
771-
if filter == 'func':
772-
return filter_value(message)
773-
return False
768+
def _test_filter(self, filter, filter_value, message):
769+
test_cases = {
770+
'content_types': lambda msg: msg.content_type in filter_value,
771+
'regexp': lambda msg: msg.content_type == 'text' and re.search(filter_value, msg.text),
772+
'commands': lambda msg: msg.content_type == 'text' and util.extract_command(msg.text) in filter_value,
773+
'func': lambda msg: filter_value(msg)
774+
}
775+
776+
return test_cases.get(filter, lambda msg: False)(message)
774777

775778
def _notify_command_handlers(self, handlers, new_messages):
776779
for message in new_messages:
777780
for message_handler in handlers:
778781
if self._test_message_handler(message_handler, message):
779-
self.__exec_task(message_handler['function'], message)
782+
self._exec_task(message_handler['function'], message)
780783
break
781784

782785

0 commit comments

Comments
 (0)