@@ -311,21 +311,20 @@ class user(Filter, set):
311311
312312 def __init__ (self , users : int or str or list = None ):
313313 users = [] if users is None else users if type (users ) is list else [users ]
314+
314315 super ().__init__ (
315- { "me" if i in ["me" , "self" ] else i . lower (). strip ( "@" ) if type ( i ) is str else i for i in users }
316- if type (users ) is list else
317- { "me" if users in [ "me" , "self" ] else users . lower (). strip ( "@" ) if type ( users ) is str else users }
316+ "me" if u in ["me" , "self" ]
317+ else u . lower (). strip ( "@" ) if type (u ) is str
318+ else u for u in users
318319 )
319320
320321 def __call__ (self , message ):
321- return bool (
322- message .from_user
323- and (message .from_user .id in self
324- or (message .from_user .username
325- and message .from_user .username .lower () in self )
326- or ("me" in self
327- and message .from_user .is_self ))
328- )
322+ return (message .from_user
323+ and (message .from_user .id in self
324+ or (message .from_user .username
325+ and message .from_user .username .lower () in self )
326+ or ("me" in self
327+ and message .from_user .is_self )))
329328
330329 # noinspection PyPep8Naming
331330 class chat (Filter , set ):
@@ -343,21 +342,21 @@ class chat(Filter, set):
343342
344343 def __init__ (self , chats : int or str or list = None ):
345344 chats = [] if chats is None else chats if type (chats ) is list else [chats ]
345+
346346 super ().__init__ (
347- { "me" if i in ["me" , "self" ] else i . lower (). strip ( "@" ) if type ( i ) is str else i for i in chats }
348- if type (chats ) is list else
349- { "me" if chats in [ "me" , "self" ] else chats . lower (). strip ( "@" ) if type ( chats ) is str else chats }
347+ "me" if c in ["me" , "self" ]
348+ else c . lower (). strip ( "@" ) if type (c ) is str
349+ else c for c in chats
350350 )
351351
352352 def __call__ (self , message ):
353- return bool (
354- message .chat
355- and (message .chat .id in self
356- or (message .chat .username
357- and message .chat .username .lower () in self )
358- or ("me" in self and message .from_user
359- and message .from_user .is_self
360- and not message .outgoing ))
361- )
353+ return (message .chat
354+ and (message .chat .id in self
355+ or (message .chat .username
356+ and message .chat .username .lower () in self )
357+ or ("me" in self
358+ and message .from_user
359+ and message .from_user .is_self
360+ and not message .outgoing )))
362361
363362 dan = create ("Dan" , lambda _ , m : bool (m .from_user and m .from_user .id == 23122162 ))
0 commit comments