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

Simplify and speedup _test_filter

Browse Source
This commit is contained in:
Badiboy
2021-08-19 22:46:12 +03:00
parent 6e871b8eb1
commit f5de0eeacf
2 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
telebot/__init__.py
View File

@ -3040,19 +3040,28 @@ class TeleBot:
def _test_filter(message_filter, filter_value, message):
"""
Test filters
:param message_filter:
:param filter_value:
:param message:
:return:
:param message_filter: Filter type passed in handler
:param filter_value: Filter value passed in handler
:param message: Message to test
:return: True if filter conforms
"""
test_cases = {
'content_types': lambda msg: msg.content_type in filter_value,
'regexp': lambda msg: msg.content_type == 'text' and re.search(filter_value, msg.text, re.IGNORECASE),
'commands': lambda msg: msg.content_type == 'text' and util.extract_command(msg.text) in filter_value,
'func': lambda msg: filter_value(msg)
}
return test_cases.get(message_filter, lambda msg: False)(message)
# test_cases = {
# 'content_types': lambda msg: msg.content_type in filter_value,
# 'regexp': lambda msg: msg.content_type == 'text' and re.search(filter_value, msg.text, re.IGNORECASE),
# 'commands': lambda msg: msg.content_type == 'text' and util.extract_command(msg.text) in filter_value,
# 'func': lambda msg: filter_value(msg)
# }
# return test_cases.get(message_filter, lambda msg: False)(message)
if message_filter == 'content_types':
return message.content_type in filter_value
elif message_filter == 'regexp':
return message.content_type == 'text' and re.search(filter_value, message.text, re.IGNORECASE)
elif message_filter == 'commands':
return message.content_type == 'text' and util.extract_command(message.text) in filter_value
elif message_filter == 'func':
return filter_value(message)
else:
return False
def _notify_command_handlers(self, handlers, new_messages):
"""