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

Optimizations from code review

Browse source
This commit is contained in:
Arslan 'Ars2014' Sakhapov 2019-08-09 12:57:32 +05:00
parent de0f8d33f2
commit bda0bdd013
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,9 +582,9 @@ class AdminFilter(Filter):
if isinstance(is_chat_admin, bool): if isinstance(is_chat_admin, bool):
self._check_current = is_chat_admin self._check_current = is_chat_admin
if isinstance(is_chat_admin, Iterable): if isinstance(is_chat_admin, Iterable):
self._chat_ids = list(map(int, is_chat_admin)) self._chat_ids = list(is_chat_admin)
else: else:
self._chat_ids = [int(is_chat_admin)] self._chat_ids = [is_chat_admin]
else: else:
self._check_current = True self._check_current = True
@ -599,19 +599,17 @@ class AdminFilter(Filter):
async def check(self, obj: Union[Message, CallbackQuery, InlineQuery]) -> bool: async def check(self, obj: Union[Message, CallbackQuery, InlineQuery]) -> bool:
user_id = obj.from_user.id user_id = obj.from_user.id
chat_ids = None
if self._check_current: if self._check_current:
if isinstance(obj, Message): if isinstance(obj, Message):
if ChatType.is_private(obj): message = obj
return False
chat_ids = [obj.chat.id]
elif isinstance(obj, CallbackQuery) and obj.message: elif isinstance(obj, CallbackQuery) and obj.message:
if ChatType.is_private(obj.message): # there is no admin in private chats message = obj.message
return False
chat_ids = [obj.message.chat.id]
else: else:
return False return False
if ChatType.is_private(message): # there is no admin in private chats
return False
chat_ids = [message.chat.id]
else: else:
chat_ids = self._chat_ids chat_ids = self._chat_ids