Remove get_chat_preview and have get_chat deal with ChatPreview objects

delivrance · delivrance · commit 53d0cc30f644 · 2019-05-17T13:18:24.000+02:00
diff --git a/pyrogram/client/methods/chats/__init__.py b/pyrogram/client/methods/chats/__init__.py
@@ -22,7 +22,6 @@
 from .get_chat_member import GetChatMember
 from .get_chat_members import GetChatMembers
 from .get_chat_members_count import GetChatMembersCount
-from .get_chat_preview import GetChatPreview
 from .get_dialogs import GetDialogs
 from .iter_chat_members import IterChatMembers
 from .iter_dialogs import IterDialogs
@@ -61,7 +60,6 @@ class Chats(
     UnpinChatMessage,
     GetDialogs,
     GetChatMembersCount,
-    GetChatPreview,
     IterDialogs,
     IterChatMembers,
     UpdateChatUsername,
diff --git a/pyrogram/client/methods/chats/get_chat.py b/pyrogram/client/methods/chats/get_chat.py
@@ -27,8 +27,9 @@ class GetChat(BaseClient):
     def get_chat(
         self,
         chat_id: Union[int, str]
-    ) -> "pyrogram.Chat":
-        """Get up to date information about the chat.
+    ) -> Union["pyrogram.Chat", "pyrogram.ChatPreview"]:
+        """Get up to date information about a chat.
+
         Information include current name of the user for one-on-one conversations, current username of a user, group or
         channel, etc.
 
@@ -39,7 +40,8 @@ def get_chat(
                 of the target channel/supergroup (in the format @username).
 
         Returns:
-            :obj:`Chat`: On success, a chat object is returned.
+            :obj:`Chat` | :obj:`ChatPreview`: On success, if you've already joined the chat, a chat object is returned,
+            otherwise, a chat preview object is returned.
 
         Raises:
             RPCError: In case of a Telegram RPC error.
@@ -48,16 +50,14 @@ def get_chat(
         match = self.INVITE_LINK_RE.match(str(chat_id))
 
         if match:
-            h = match.group(1)
-
             r = self.send(
                 functions.messages.CheckChatInvite(
-                    hash=h
+                    hash=match.group(1)
                 )
             )
 
             if isinstance(r, types.ChatInvite):
-                raise ValueError("You haven't joined \"t.me/joinchat/{}\" yet".format(h))
+                return pyrogram.ChatPreview._parse(self, r)
 
             self.fetch_peers([r.chat])
 
diff --git a/pyrogram/client/methods/chats/get_chat_preview.py b/pyrogram/client/methods/chats/get_chat_preview.py
diff --git a/pyrogram/client/types/user_and_chats/chat_preview.py b/pyrogram/client/types/user_and_chats/chat_preview.py
@@ -32,7 +32,7 @@ class ChatPreview(PyrogramType):
         title (``str``):
             Title of the chat.
 
-        photo (:obj:`ChatPhoto`):
+        photo (:obj:`ChatPhoto`, *optional*):
             Chat photo. Suitable for downloads only.
 
         type (``str``):
@@ -52,7 +52,7 @@ def __init__(
         *,
         client: "pyrogram.BaseClient" = None,
         title: str,
-        photo: ChatPhoto,
+        photo: ChatPhoto = None,
         type: str,
         members_count: int,
         members: List[User] = None
