Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

command filter now can be sets with BotCommand object #935

Merged
merged 8 commits into from Aug 13, 2022
Merged

command filter now can be sets with BotCommand object #935

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
23568d6
command filter now can be sets with BotCommand object instead of or t…
bomzheg Jun 24, 2022
7f83208
CR fix: fix isinstance
bomzheg Jun 28, 2022
4aac637
CR fix: add tests, fix union
bomzheg Jul 8, 2022
e8b09d3
CR fix: add isinstance check
bomzheg Jul 8, 2022
2dffa0e
CR fix: add isinstance check
bomzheg Jul 8, 2022
9b83aa3
CR fix: add forgotten format
bomzheg Jul 12, 2022
2984c83
CR fix: bugfix with type guard
bomzheg Jul 12, 2022
7df7273
CR fix: fix function names, replace map to generator comprehension
bomzheg Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions aiogram/dispatcher/filters/builtin.py
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@

from aiogram import types
from aiogram.dispatcher.filters.filters import BoundFilter, Filter
from aiogram.types import CallbackQuery, ChatType, InlineQuery, Message, Poll, ChatMemberUpdated
from aiogram.types import CallbackQuery, ChatType, InlineQuery, Message, Poll, ChatMemberUpdated, BotCommand

ChatIDArgumentType = typing.Union[typing.Iterable[typing.Union[int, str]], str, int]

Expand All @@ -34,7 +34,7 @@ class Command(Filter):
By default this filter is registered for messages and edited messages handlers.
"""

def __init__(self, commands: Union[Iterable, str],
def __init__(self, commands: Union[Iterable[str], Iterable[BotCommand], str, BotCommand],
evgfilim1 marked this conversation as resolved.
Show resolved Hide resolved
prefixes: Union[Iterable, str] = '/',
ignore_case: bool = True,
ignore_mention: bool = False,
Expand Down Expand Up @@ -66,8 +66,10 @@ def __init__(self, commands: Union[Iterable, str],
@dp.message_handler(commands=['myCommand'], commands_ignore_caption=False, content_types=ContentType.ANY)
@dp.message_handler(Command(['myCommand'], ignore_caption=False), content_types=[ContentType.TEXT, ContentType.DOCUMENT])
"""
if isinstance(commands, str):
if isinstance(commands, str) or isinstance(commands, BotCommand):
evgfilim1 marked this conversation as resolved.
Show resolved Hide resolved
commands = (commands,)
if isinstance(commands, Iterable):
commands = [cmd.command if isinstance(cmd, BotCommand) else cmd for cmd in commands]
JrooTJunior marked this conversation as resolved.
Show resolved Hide resolved

self.commands = list(map(str.lower, commands)) if ignore_case else commands
self.prefixes = prefixes
Expand Down