python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 10:11:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

The introduction of a new filter factory into the registration of handlers

Browse source
This commit is contained in:
Alex Root Junior 2018-06-25 18:05:32 +03:00
parent 52304bb51c
commit 759055ed66
3 changed files with 97 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

193
aiogram/dispatcher/dispatcher.py
View file

@ -161,47 +161,34 @@ class Dispatcher:
try: try:
if update.message: if update.message:
# state = await self.storage.get_state(chat=update.message.chat.id,
# user=update.message.from_user.id)
types.User.set_current(update.message.from_user) types.User.set_current(update.message.from_user)
types.Chat.set_current(update.message.chat) types.Chat.set_current(update.message.chat)
return await self.message_handlers.notify(update.message) return await self.message_handlers.notify(update.message)
if update.edited_message: if update.edited_message:
# state = await self.storage.get_state(chat=update.edited_message.chat.id,
# user=update.edited_message.from_user.id)
types.User.set_current(update.edited_message.from_user) types.User.set_current(update.edited_message.from_user)
types.Chat.set_current(update.edited_message.chat) types.Chat.set_current(update.edited_message.chat)
return await self.edited_message_handlers.notify(update.edited_message) return await self.edited_message_handlers.notify(update.edited_message)
if update.channel_post: if update.channel_post:
# state = await self.storage.get_state(chat=update.channel_post.chat.id)
types.Chat.set_current(update.channel_post.chat) types.Chat.set_current(update.channel_post.chat)
return await self.channel_post_handlers.notify(update.channel_post) return await self.channel_post_handlers.notify(update.channel_post)
if update.edited_channel_post: if update.edited_channel_post:
# state = await self.storage.get_state(chat=update.edited_channel_post.chat.id)
types.Chat.set_current(update.edited_channel_post.chat) types.Chat.set_current(update.edited_channel_post.chat)
return await self.edited_channel_post_handlers.notify(update.edited_channel_post) return await self.edited_channel_post_handlers.notify(update.edited_channel_post)
if update.inline_query: if update.inline_query:
# state = await self.storage.get_state(user=update.inline_query.from_user.id)
types.User.set_current(update.inline_query.from_user) types.User.set_current(update.inline_query.from_user)
return await self.inline_query_handlers.notify(update.inline_query) return await self.inline_query_handlers.notify(update.inline_query)
if update.chosen_inline_result: if update.chosen_inline_result:
# state = await self.storage.get_state(user=update.chosen_inline_result.from_user.id)
types.User.set_current(update.chosen_inline_result.from_user) types.User.set_current(update.chosen_inline_result.from_user)
return await self.chosen_inline_result_handlers.notify(update.chosen_inline_result) return await self.chosen_inline_result_handlers.notify(update.chosen_inline_result)
if update.callback_query: if update.callback_query:
# state = await self.storage.get_state(
# chat=update.callback_query.message.chat.id if update.callback_query.message else None,
# user=update.callback_query.from_user.id)
if update.callback_query.message: if update.callback_query.message:
types.Chat.set_current(update.callback_query.message.chat) types.Chat.set_current(update.callback_query.message.chat)
types.User.set_current(update.callback_query.from_user) types.User.set_current(update.callback_query.from_user)
return await self.callback_query_handlers.notify(update.callback_query) return await self.callback_query_handlers.notify(update.callback_query)
if update.shipping_query: if update.shipping_query:
# state = await self.storage.get_state(user=update.shipping_query.from_user.id)
types.User.set_current(update.shipping_query.from_user) types.User.set_current(update.shipping_query.from_user)
return await self.shipping_query_handlers.notify(update.shipping_query) return await self.shipping_query_handlers.notify(update.shipping_query)
if update.pre_checkout_query: if update.pre_checkout_query:
# state = await self.storage.get_state(user=update.pre_checkout_query.from_user.id)
types.User.set_current(update.pre_checkout_query.from_user) types.User.set_current(update.pre_checkout_query.from_user)
return await self.pre_checkout_query_handlers.notify(update.pre_checkout_query) return await self.pre_checkout_query_handlers.notify(update.pre_checkout_query)
except Exception as e: except Exception as e:
@ -331,7 +318,7 @@ class Dispatcher:
# If you want to handle all states by one handler, use `state="*"`. # If you want to handle all states by one handler, use `state="*"`.
dp.register_message_handler(cancel_handler, commands=['cancel'], state="*") dp.register_message_handler(cancel_handler, commands=['cancel'], state="*")
dp.register_message_handler(cancel_handler, func=lambda msg: msg.text.lower() == 'cancel', state="*") dp.register_message_handler(cancel_handler, lambda msg: msg.text.lower() == 'cancel', state="*")
:param callback: :param callback:
:param commands: list of commands :param commands: list of commands
@ -390,7 +377,7 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.message_handler(func=lambda message: message.text and 'hello' in message.text.lower()) @dp.message_handler(lambda message: message.text and 'hello' in message.text.lower())
async def text_handler(message: types.Message): async def text_handler(message: types.Message):
Use multiple filters: Use multiple filters:
@ -405,7 +392,7 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.message_handler(commands=['command']) @dp.message_handler(commands=['command'])
@dp.message_handler(func=lambda message: demojize(message.text) == ':new_moon_with_face:') @dp.message_handler(lambda message: demojize(message.text) == ':new_moon_with_face:')
async def text_handler(message: types.Message): async def text_handler(message: types.Message):
This handler will be called if the message starts with '/command' OR is some emoji This handler will be called if the message starts with '/command' OR is some emoji
@ -430,8 +417,8 @@ class Dispatcher:
return decorator return decorator
def register_edited_message_handler(self, callback, *, commands=None, regexp=None, content_types=None, func=None, def register_edited_message_handler(self, callback, *custom_filters, commands=None, regexp=None, content_types=None,
state=None, custom_filters=None, run_task=None, **kwargs): state=None, run_task=None, **kwargs):
""" """
Register handler for edited message Register handler for edited message
@ -439,29 +426,22 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
:return: decorated function :return: decorated function
""" """
if content_types is None: filters_set = self.filters_factory.resolve(self.edited_message_handlers,
content_types = ContentType.TEXT
if custom_filters is None:
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
commands=commands, commands=commands,
regexp=regexp, regexp=regexp,
content_types=content_types, content_types=content_types,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.edited_message_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.edited_message_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def edited_message_handler(self, *custom_filters, commands=None, regexp=None, content_types=None, func=None, def edited_message_handler(self, *custom_filters, commands=None, regexp=None, content_types=None,
state=None, run_task=None, **kwargs): state=None, run_task=None, **kwargs):
""" """
Decorator for edited message handler Decorator for edited message handler
@ -477,7 +457,6 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -486,15 +465,14 @@ class Dispatcher:
""" """
def decorator(callback): def decorator(callback):
self.register_edited_message_handler(callback, commands=commands, regexp=regexp, self.register_edited_message_handler(callback, *custom_filters, commands=commands, regexp=regexp,
content_types=content_types, func=func, state=state, content_types=content_types, state=state, run_task=run_task, **kwargs)
custom_filters=custom_filters, run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_channel_post_handler(self, callback, *, commands=None, regexp=None, content_types=None, func=None, def register_channel_post_handler(self, callback, *custom_filters, commands=None, regexp=None, content_types=None,
state=None, custom_filters=None, run_task=None, **kwargs): state=None, run_task=None, **kwargs):
""" """
Register handler for channel post Register handler for channel post
@ -502,29 +480,22 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
:return: decorated function :return: decorated function
""" """
if content_types is None: filters_set = self.filters_factory.resolve(self.channel_post_handlers,
content_types = ContentType.TEXT
if custom_filters is None:
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
commands=commands, commands=commands,
regexp=regexp, regexp=regexp,
content_types=content_types, content_types=content_types,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.channel_post_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.channel_post_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def channel_post_handler(self, *custom_filters, commands=None, regexp=None, content_types=None, func=None, def channel_post_handler(self, *custom_filters, commands=None, regexp=None, content_types=None,
state=None, run_task=None, **kwargs): state=None, run_task=None, **kwargs):
""" """
Decorator for channel post handler Decorator for channel post handler
@ -532,24 +503,21 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
:return: decorated function :return: decorated function
""" """
def decorator(callback): def decorator(callback):
self.register_channel_post_handler(callback, commands=commands, regexp=regexp, content_types=content_types, self.register_channel_post_handler(callback, *custom_filters, commands=commands, regexp=regexp,
func=func, state=state, custom_filters=custom_filters, content_types=content_types, state=state, run_task=run_task, **kwargs)
run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_edited_channel_post_handler(self, callback, *, commands=None, regexp=None, content_types=None, def register_edited_channel_post_handler(self, callback, *custom_filters, commands=None, regexp=None,
func=None, state=None, custom_filters=None, run_task=None, **kwargs): content_types=None, state=None, run_task=None, **kwargs):
""" """
Register handler for edited channel post Register handler for edited channel post
@ -557,29 +525,22 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
:return: decorated function :return: decorated function
""" """
if content_types is None: filters_set = self.filters_factory.resolve(self.edited_message_handlers,
content_types = ContentType.TEXT
if custom_filters is None:
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
commands=commands, commands=commands,
regexp=regexp, regexp=regexp,
content_types=content_types, content_types=content_types,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.edited_channel_post_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.edited_channel_post_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def edited_channel_post_handler(self, *custom_filters, commands=None, regexp=None, content_types=None, func=None, def edited_channel_post_handler(self, *custom_filters, commands=None, regexp=None, content_types=None,
state=None, run_task=None, **kwargs): state=None, run_task=None, **kwargs):
""" """
Decorator for edited channel post handler Decorator for edited channel post handler
@ -587,7 +548,6 @@ class Dispatcher:
:param commands: list of commands :param commands: list of commands
:param regexp: REGEXP :param regexp: REGEXP
:param content_types: List of content types. :param content_types: List of content types.
:param func: custom any callable object
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param state: :param state:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -596,14 +556,14 @@ class Dispatcher:
""" """
def decorator(callback): def decorator(callback):
self.register_edited_channel_post_handler(callback, commands=commands, regexp=regexp, self.register_edited_channel_post_handler(callback, *custom_filters, commands=commands, regexp=regexp,
content_types=content_types, func=func, state=state, content_types=content_types, state=state, run_task=run_task,
custom_filters=custom_filters, run_task=run_task, **kwargs) **kwargs)
return callback return callback
return decorator return decorator
def register_inline_handler(self, callback, *, func=None, state=None, custom_filters=None, run_task=None, **kwargs): def register_inline_handler(self, callback, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Register handler for inline query Register handler for inline query
@ -611,10 +571,9 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
dp.register_inline_handler(some_inline_handler, func=lambda inline_query: True) dp.register_inline_handler(some_inline_handler, lambda inline_query: True)
:param callback: :param callback:
:param func: custom any callable object
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param state: :param state:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -623,14 +582,13 @@ class Dispatcher:
""" """
if custom_filters is None: if custom_filters is None:
custom_filters = [] custom_filters = []
filters_set = generate_default_filters(self, filters_set = self.filters_factory.resolve(self.inline_query_handlers,
*custom_filters, *custom_filters,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.inline_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.inline_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def inline_handler(self, *custom_filters, func=None, state=None, run_task=None, **kwargs): def inline_handler(self, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Decorator for inline query handler Decorator for inline query handler
@ -638,10 +596,9 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.inline_handler(func=lambda inline_query: True) @dp.inline_handler(lambda inline_query: True)
async def some_inline_handler(inline_query: types.InlineQuery) async def some_inline_handler(inline_query: types.InlineQuery)
:param func: custom any callable object
:param state: :param state:
:param custom_filters: list of custom filters :param custom_filters: list of custom filters
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -650,14 +607,12 @@ class Dispatcher:
""" """
def decorator(callback): def decorator(callback):
self.register_inline_handler(callback, func=func, state=state, custom_filters=custom_filters, self.register_inline_handler(callback, *custom_filters, state=state, run_task=run_task, **kwargs)
run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_chosen_inline_handler(self, callback, *, func=None, state=None, custom_filters=None, run_task=None, def register_chosen_inline_handler(self, callback, *custom_filters, state=None, run_task=None, **kwargs):
**kwargs):
""" """
Register handler for chosen inline query Register handler for chosen inline query
@ -665,10 +620,9 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
dp.register_chosen_inline_handler(some_chosen_inline_handler, func=lambda chosen_inline_query: True) dp.register_chosen_inline_handler(some_chosen_inline_handler, lambda chosen_inline_query: True)
:param callback: :param callback:
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -677,14 +631,13 @@ class Dispatcher:
""" """
if custom_filters is None: if custom_filters is None:
custom_filters = [] custom_filters = []
filters_set = generate_default_filters(self, filters_set = self.filters_factory.resolve(self.chosen_inline_result_handlers,
*custom_filters, *custom_filters,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.chosen_inline_result_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.chosen_inline_result_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def chosen_inline_handler(self, *custom_filters, func=None, state=None, run_task=None, **kwargs): def chosen_inline_handler(self, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Decorator for chosen inline query handler Decorator for chosen inline query handler
@ -692,10 +645,9 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.chosen_inline_handler(func=lambda chosen_inline_query: True) @dp.chosen_inline_handler(lambda chosen_inline_query: True)
async def some_chosen_inline_handler(chosen_inline_query: types.ChosenInlineResult) async def some_chosen_inline_handler(chosen_inline_query: types.ChosenInlineResult)
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -704,14 +656,12 @@ class Dispatcher:
""" """
def decorator(callback): def decorator(callback):
self.register_chosen_inline_handler(callback, func=func, state=state, custom_filters=custom_filters, self.register_chosen_inline_handler(callback, *custom_filters, state=state, run_task=run_task, **kwargs)
run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_callback_query_handler(self, callback, *, func=None, state=None, custom_filters=None, run_task=None, def register_callback_query_handler(self, callback, *custom_filters, state=None, run_task=None, **kwargs):
**kwargs):
""" """
Register handler for callback query Register handler for callback query
@ -719,25 +669,21 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
dp.register_callback_query_handler(some_callback_handler, func=lambda callback_query: True) dp.register_callback_query_handler(some_callback_handler, lambda callback_query: True)
:param callback: :param callback:
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
""" """
if custom_filters is None: filters_set = self.filters_factory.resolve(self.callback_query_handlers,
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.callback_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.callback_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def callback_query_handler(self, *custom_filters, func=None, state=None, run_task=None, **kwargs): def callback_query_handler(self, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Decorator for callback query handler Decorator for callback query handler
@ -745,24 +691,21 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.callback_query_handler(func=lambda callback_query: True) @dp.callback_query_handler(lambda callback_query: True)
async def some_callback_handler(callback_query: types.CallbackQuery) async def some_callback_handler(callback_query: types.CallbackQuery)
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
""" """
def decorator(callback): def decorator(callback):
self.register_callback_query_handler(callback, func=func, state=state, custom_filters=custom_filters, self.register_callback_query_handler(callback, *custom_filters, state=state, run_task=run_task, **kwargs)
run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_shipping_query_handler(self, callback, *, func=None, state=None, custom_filters=None, run_task=None, def register_shipping_query_handler(self, callback, *custom_filters, state=None, run_task=None,
**kwargs): **kwargs):
""" """
Register handler for shipping query Register handler for shipping query
@ -771,25 +714,21 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
dp.register_shipping_query_handler(some_shipping_query_handler, func=lambda shipping_query: True) dp.register_shipping_query_handler(some_shipping_query_handler, lambda shipping_query: True)
:param callback: :param callback:
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
""" """
if custom_filters is None: filters_set = self.filters_factory.resolve(self.shipping_query_handlers,
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.shipping_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.shipping_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def shipping_query_handler(self, *custom_filters, func=None, state=None, run_task=None, **kwargs): def shipping_query_handler(self, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Decorator for shipping query handler Decorator for shipping query handler
@ -797,25 +736,21 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.shipping_query_handler(func=lambda shipping_query: True) @dp.shipping_query_handler(lambda shipping_query: True)
async def some_shipping_query_handler(shipping_query: types.ShippingQuery) async def some_shipping_query_handler(shipping_query: types.ShippingQuery)
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
""" """
def decorator(callback): def decorator(callback):
self.register_shipping_query_handler(callback, func=func, state=state, custom_filters=custom_filters, self.register_shipping_query_handler(callback, *custom_filters, state=state, run_task=run_task, **kwargs)
run_task=run_task, **kwargs)
return callback return callback
return decorator return decorator
def register_pre_checkout_query_handler(self, callback, *, func=None, state=None, custom_filters=None, def register_pre_checkout_query_handler(self, callback, *custom_filters, state=None, run_task=None, **kwargs):
run_task=None, **kwargs):
""" """
Register handler for pre-checkout query Register handler for pre-checkout query
@ -823,25 +758,21 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
dp.register_pre_checkout_query_handler(some_pre_checkout_query_handler, func=lambda shipping_query: True) dp.register_pre_checkout_query_handler(some_pre_checkout_query_handler, lambda shipping_query: True)
:param callback: :param callback:
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:param kwargs: :param kwargs:
""" """
if custom_filters is None: filters_set = self.filters_factory.resolve(self.pre_checkout_query_handlers,
custom_filters = []
filters_set = generate_default_filters(self,
*custom_filters, *custom_filters,
func=func,
state=state, state=state,
**kwargs) **kwargs)
self.pre_checkout_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.pre_checkout_query_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def pre_checkout_query_handler(self, *custom_filters, func=None, state=None, run_task=None, **kwargs): def pre_checkout_query_handler(self, *custom_filters, state=None, run_task=None, **kwargs):
""" """
Decorator for pre-checkout query handler Decorator for pre-checkout query handler
@ -849,10 +780,9 @@ class Dispatcher:
.. code-block:: python3 .. code-block:: python3
@dp.pre_checkout_query_handler(func=lambda shipping_query: True) @dp.pre_checkout_query_handler(lambda shipping_query: True)
async def some_pre_checkout_query_handler(shipping_query: types.ShippingQuery) async def some_pre_checkout_query_handler(shipping_query: types.ShippingQuery)
:param func: custom any callable object
:param state: :param state:
:param custom_filters: :param custom_filters:
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
@ -860,33 +790,30 @@ class Dispatcher:
""" """
def decorator(callback): def decorator(callback):
self.register_pre_checkout_query_handler(callback, func=func, state=state, custom_filters=custom_filters, self.register_pre_checkout_query_handler(callback, *custom_filters, state=state, run_task=run_task,
run_task=run_task, **kwargs) **kwargs)
return callback return callback
return decorator return decorator
def register_errors_handler(self, callback, *, func=None, exception=None, run_task=None): def register_errors_handler(self, callback, *custom_filters, exception=None, run_task=None, **kwargs):
""" """
Register handler for errors Register handler for errors
:param callback: :param callback:
:param func:
:param exception: you can make handler for specific errors type :param exception: you can make handler for specific errors type
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
""" """
filters_set = [] filters_set = self.filters_factory.resolve(self.errors_handlers,
if func is not None: *custom_filters,
filters_set.append(func) exception=exception,
if exception is not None: **kwargs)
filters_set.append(ExceptionsFilter(exception))
self.errors_handlers.register(self._wrap_async_task(callback, run_task), filters_set) self.errors_handlers.register(self._wrap_async_task(callback, run_task), filters_set)
def errors_handler(self, func=None, exception=None, run_task=None): def errors_handler(self, *custom_filters, exception=None, run_task=None, **kwargs):
""" """
Decorator for errors handler Decorator for errors handler
:param func:
:param exception: you can make handler for specific errors type :param exception: you can make handler for specific errors type
:param run_task: run callback in task (no wait results) :param run_task: run callback in task (no wait results)
:return: :return:
@ -894,7 +821,7 @@ class Dispatcher:
def decorator(callback): def decorator(callback):
self.register_errors_handler(self._wrap_async_task(callback, run_task), self.register_errors_handler(self._wrap_async_task(callback, run_task),
func=func, exception=exception) *custom_filters, exception=exception, **kwargs)
return callback return callback
return decorator return decorator

3
aiogram/dispatcher/filters/__init__.py
View file

@ -1,5 +1,5 @@
from .builtin import CommandsFilter, ContentTypeFilter, ExceptionsFilter, RegexpCommandsFilter, \ from .builtin import CommandsFilter, ContentTypeFilter, ExceptionsFilter, RegexpCommandsFilter, \
RegexpFilter, StateFilter, StatesListFilter RegexpFilter, StateFilter
from .factory import FiltersFactory from .factory import FiltersFactory
from .filters import AbstractFilter, BaseFilter, FilterNotPassed, FilterRecord, check_filter, check_filters from .filters import AbstractFilter, BaseFilter, FilterNotPassed, FilterRecord, check_filter, check_filters
@ -14,7 +14,6 @@ __all__ = [
'RegexpCommandsFilter', 'RegexpCommandsFilter',
'RegexpFilter', 'RegexpFilter',
'StateFilter', 'StateFilter',
'StatesListFilter',
'check_filter', 'check_filter',
'check_filters', 'check_filters',
'FilterNotPassed' 'FilterNotPassed'

21
aiogram/dispatcher/filters/builtin.py
View file

@ -135,10 +135,8 @@ class StateFilter(BaseFilter):
return {cls.key: None} return {cls.key: None}
async def check(self, obj): async def check(self, obj):
from ..dispatcher import Dispatcher
if '*' in self.state: if '*' in self.state:
return {'state': Dispatcher.current().current_state()} return {'state': self.dispatcher.current_state()}
try: try:
state = self.ctx_state.get() state = self.ctx_state.get()
@ -149,28 +147,15 @@ class StateFilter(BaseFilter):
state = await self.dispatcher.storage.get_state(chat=chat, user=user) state = await self.dispatcher.storage.get_state(chat=chat, user=user)
self.ctx_state.set(state) self.ctx_state.set(state)
if state in self.state: if state in self.state:
return {'state': Dispatcher.current().current_state(), 'raw_state': state} return {'state': self.dispatcher.current_state(), 'raw_state': state}
else: else:
if state in self.state: if state in self.state:
return {'state': Dispatcher.current().current_state(), 'raw_state': state} return {'state': self.dispatcher.current_state(), 'raw_state': state}
return False return False
class StatesListFilter(StateFilter):
"""
List of states
"""
async def check(self, obj):
chat, user = self.get_target(obj)
if chat or user:
return await self.dispatcher.storage.get_state(chat=chat, user=user) in self.state
return False
class ExceptionsFilter(BaseFilter): class ExceptionsFilter(BaseFilter):
""" """
Filter for exceptions Filter for exceptions