Add MediaGroup Filter (#528)

* Add MediaGroupFilter

* Update __init__.py

* Register MediaGroupFilter

* Update docs

* Fix a typo
This commit is contained in:
Daniil Kovalenko 2021-03-21 00:52:35 +07:00 committed by GitHub
parent 7cce8b6397
commit eed147e2e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 2 deletions

View file

@ -11,7 +11,7 @@ from aiohttp.helpers import sentinel
from aiogram.utils.deprecated import renamed_argument from aiogram.utils.deprecated import renamed_argument
from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, HashTag, Regexp, \ from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, HashTag, Regexp, \
RegexpCommandsFilter, StateFilter, Text, IDFilter, AdminFilter, IsReplyFilter, ForwardedMessageFilter, \ RegexpCommandsFilter, StateFilter, Text, IDFilter, AdminFilter, IsReplyFilter, ForwardedMessageFilter, \
IsSenderContact, ChatTypeFilter, AbstractFilter IsSenderContact, ChatTypeFilter, MediaGroupFilter, AbstractFilter
from .handler import Handler from .handler import Handler
from .middlewares import MiddlewareManager from .middlewares import MiddlewareManager
from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, \ from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, \
@ -204,6 +204,12 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
self.my_chat_member_handlers, self.my_chat_member_handlers,
self.chat_member_handlers self.chat_member_handlers
]) ])
filters_factory.bind(MediaGroupFilter, event_handlers=[
self.message_handlers,
self.edited_channel_post_handlers,
self.channel_post_handlers,
self.edited_channel_post_handlers
])
def __del__(self): def __del__(self):
self.stop_polling() self.stop_polling()

View file

@ -1,7 +1,7 @@
from .builtin import Command, CommandHelp, CommandPrivacy, CommandSettings, CommandStart, ContentTypeFilter, \ from .builtin import Command, CommandHelp, CommandPrivacy, CommandSettings, CommandStart, ContentTypeFilter, \
ExceptionsFilter, HashTag, Regexp, RegexpCommandsFilter, StateFilter, \ ExceptionsFilter, HashTag, Regexp, RegexpCommandsFilter, StateFilter, \
Text, IDFilter, AdminFilter, IsReplyFilter, IsSenderContact, ForwardedMessageFilter, \ Text, IDFilter, AdminFilter, IsReplyFilter, IsSenderContact, ForwardedMessageFilter, \
ChatTypeFilter ChatTypeFilter, MediaGroupFilter
from .factory import FiltersFactory from .factory import FiltersFactory
from .filters import AbstractFilter, BoundFilter, Filter, FilterNotPassed, FilterRecord, execute_filter, \ from .filters import AbstractFilter, BoundFilter, Filter, FilterNotPassed, FilterRecord, execute_filter, \
check_filters, get_filter_spec, get_filters_spec check_filters, get_filter_spec, get_filters_spec
@ -25,6 +25,7 @@ __all__ = (
'IsSenderContact', 'IsSenderContact',
'ForwardedMessageFilter', 'ForwardedMessageFilter',
'ChatTypeFilter', 'ChatTypeFilter',
'MediaGroupFilter',
'FiltersFactory', 'FiltersFactory',
'AbstractFilter', 'AbstractFilter',
'BoundFilter', 'BoundFilter',

View file

@ -738,3 +738,20 @@ class ChatTypeFilter(BoundFilter):
return False return False
return obj.type in self.chat_type return obj.type in self.chat_type
class MediaGroupFilter(BoundFilter):
"""
Check if message is part of a media group.
`is_media_group=True` - the message is part of a media group
`is_media_group=False` - the message is NOT part of a media group
"""
key = "is_media_group"
def __init__(self, is_media_group: bool):
self.is_media_group = is_media_group
async def check(self, message: types.Message) -> bool:
return bool(getattr(message, "media_group_id")) is self.is_media_group

View file

@ -155,6 +155,14 @@ ChatTypeFilter
.. autoclass:: aiogram.dispatcher.filters.ChatTypeFilter .. autoclass:: aiogram.dispatcher.filters.ChatTypeFilter
:members: :members:
:show-inheritance: :show-inheritance:
MediaGroupFilter
-------------
.. autoclass:: aiogram.dispatcher.filters.MediaGroupFilter
:members:
:show-inheritance:
Making own filters (Custom filters) Making own filters (Custom filters)