python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make self.user_id and self.chat_id Set[int] in IDFilter

Browse source
This commit is contained in:
Senpos 2020-05-03 18:00:35 +03:00
parent 60bcd88b68
commit ac7758aeb0
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,14 +15,14 @@ from aiogram.types import CallbackQuery, Message, InlineQuery, Poll, ChatType
IDFilterArgumentType = typing.Union[typing.Iterable[typing.Union[int, str]], str, int] IDFilterArgumentType = typing.Union[typing.Iterable[typing.Union[int, str]], str, int]
def extract_filter_ids(id_filter_argument: IDFilterArgumentType) -> typing.List[int]: def extract_filter_ids(id_filter_argument: IDFilterArgumentType) -> typing.Set[int]:
# since "str" is also an "Iterable", we have to check for it first # since "str" is also an "Iterable", we have to check for it first
if isinstance(id_filter_argument, str): if isinstance(id_filter_argument, str):
return [int(id_filter_argument)] return {int(id_filter_argument),}
if isinstance(id_filter_argument, Iterable): if isinstance(id_filter_argument, Iterable):
return [int(item) for (item) in id_filter_argument] return {int(item) for (item) in id_filter_argument}
# the last possible type is a single "int" # the last possible type is a single "int"
return [id_filter_argument] return {id_filter_argument,}
class Command(Filter): class Command(Filter):
@ -569,8 +569,8 @@ class IDFilter(Filter):
if user_id is None and chat_id is None: if user_id is None and chat_id is None:
raise ValueError("Both user_id and chat_id can't be None") raise ValueError("Both user_id and chat_id can't be None")
self.user_id: Optional[IDFilterArgumentType] = None self.user_id: Optional[typing.Set[int]] = None
self.chat_id: Optional[IDFilterArgumentType] = None self.chat_id: Optional[typing.Set[int]] = None
if user_id: if user_id:
self.user_id = extract_filter_ids(user_id) self.user_id = extract_filter_ids(user_id)