Remove optional parameter from IsPrivateChat

telegram_crypto_price_bot/command/command_base.py

@@ -115,23 +115,25 @@ def _IsUserAnonymous(self) -> bool:
 
     # Get if user is authorized
     def _IsUserAuthorized(self) -> bool:
-        # In channels only admins can write, so we consider the user authorized since there is no way to know the specific user
-        # This is a limitation for channels only
-        if ChatHelper.IsPrivateChat(self.cmd_data.Chat(), self.cmd_data.User()):
-            return True
-
         cmd_user = self.cmd_data.User()
         if cmd_user is None:
             return False
 
+        # In channels only admins can write, so we consider the user authorized since there is no way to know the specific user
+        # This is a limitation for channels only
+        if ChatHelper.IsPrivateChat(self.cmd_data.Chat(), cmd_user):
+            return True
+
         admin_members = ChatMembersGetter(self.client).GetAdmins(self.cmd_data.Chat())
         return any((cmd_user.id == member.user.id for member in admin_members if member.user is not None))
 
     # Get if chat is private
     def _IsPrivateChat(self) -> bool:
-        if self._IsChannel():
+        cmd_user = self.cmd_data.User()
+        if self._IsChannel() or cmd_user is None:
             return False
-        return ChatHelper.IsPrivateChat(self.cmd_data.Chat(), self.cmd_data.User())
+        return ChatHelper.IsPrivateChat(self.cmd_data.Chat(), cmd_user)
+
 
     # Log command
     def __LogCommand(self) -> None:

telegram_crypto_price_bot/misc/helpers.py

@@ -52,7 +52,7 @@ def GetTitleOrId(chat: pyrogram.types.Chat) -> str:
     # Get if private chat
     @staticmethod
     def IsPrivateChat(chat: pyrogram.types.Chat,
-                      user: Optional[pyrogram.types.User]):
+                      user: pyrogram.types.User):
         if ChatHelper.IsChannel(chat) or user is None:
             return False
         return chat.id == user.id