Refactor filters.

This commit is contained in:
Alex Root Junior 2018-07-13 22:58:47 +03:00
parent 539c76a062
commit f957883082
5 changed files with 191 additions and 80 deletions

View file

@ -6,8 +6,9 @@ import time
import typing
from contextvars import ContextVar
from .filters import CommandsFilter, ContentTypeFilter, ExceptionsFilter, FiltersFactory, RegexpCommandsFilter, \
RegexpFilter, StateFilter
from aiogram.dispatcher.filters import Command
from .filters import ContentTypeFilter, ExceptionsFilter, FiltersFactory, RegexpCommandsFilter, \
Regexp, StateFilter
from .handler import Handler
from .middlewares import MiddlewareManager
from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, \
@ -84,10 +85,10 @@ class Dispatcher:
self.message_handlers, self.edited_message_handlers,
self.channel_post_handlers, self.edited_channel_post_handlers,
])
filters_factory.bind(CommandsFilter, event_handlers=[
filters_factory.bind(Command, event_handlers=[
self.message_handlers, self.edited_message_handlers
])
filters_factory.bind(RegexpFilter, event_handlers=[
filters_factory.bind(Regexp, event_handlers=[
self.message_handlers, self.edited_message_handlers,
self.channel_post_handlers, self.edited_channel_post_handlers,
self.callback_query_handlers