Remove ChatMembers type

delivrance · delivrance · commit 2db2ca3283ed · 2019-06-08T13:50:17.000+02:00
diff --git a/docs/source/api/types.rst b/docs/source/api/types.rst
@@ -30,7 +30,6 @@ Users & Chats
     - :class:`ChatPreview`
     - :class:`ChatPhoto`
     - :class:`ChatMember`
-    - :class:`ChatMembers`
     - :class:`ChatPermissions`
     - :class:`Dialog`
     - :class:`Dialogs`
@@ -123,7 +122,6 @@ Details
 .. autoclass:: ChatPreview()
 .. autoclass:: ChatPhoto()
 .. autoclass:: ChatMember()
-.. autoclass:: ChatMembers()
 .. autoclass:: ChatPermissions()
 .. autoclass:: Dialog()
 .. autoclass:: Dialogs()
diff --git a/pyrogram/client/methods/chats/get_chat_member.py b/pyrogram/client/methods/chats/get_chat_member.py
@@ -51,13 +51,18 @@ def get_chat_member(
         user = self.resolve_peer(user_id)
 
         if isinstance(chat, types.InputPeerChat):
-            full_chat = self.send(
+            r = self.send(
                 functions.messages.GetFullChat(
                     chat_id=chat.chat_id
                 )
             )
 
-            for member in pyrogram.ChatMembers._parse(self, full_chat).chat_members:
+            members = r.full_chat.participants.participants
+            users = {i.id: i for i in r.users}
+
+            for member in members:
+                member = pyrogram.ChatMember._parse(self, member, users)
+
                 if isinstance(user, types.InputPeerSelf):
                     if member.user.is_self:
                         return member
diff --git a/pyrogram/client/methods/chats/get_chat_members.py b/pyrogram/client/methods/chats/get_chat_members.py
@@ -18,7 +18,7 @@
 
 import logging
 import time
-from typing import Union
+from typing import Union, List
 
 import pyrogram
 from pyrogram.api import functions, types
@@ -45,7 +45,7 @@ def get_chat_members(
         limit: int = 200,
         query: str = "",
         filter: str = Filters.ALL
-    ) -> "pyrogram.ChatMembers":
+    ) -> List["pyrogram.ChatMember"]:
         """Get a chunk of the members list of a chat.
 
         You can get up to 200 chat members at once.
@@ -59,15 +59,16 @@ def get_chat_members(
 
             offset (``int``, *optional*):
                 Sequential number of the first member to be returned.
-                Defaults to 0 [1]_.
+                Only applicable to supergroups and channels. Defaults to 0 [1]_.
 
             limit (``int``, *optional*):
                 Limits the number of members to be retrieved.
+                Only applicable to supergroups and channels.
                 Defaults to 200, which is also the maximum server limit allowed per method call.
 
             query (``str``, *optional*):
                 Query string to filter members based on their display names and usernames.
-                Defaults to "" (empty string) [2]_.
+                Only applicable to supergroups and channels. Defaults to "" (empty string) [2]_.
 
             filter (``str``, *optional*):
                 Filter used to select the kind of members you want to retrieve. Only applicable for supergroups
@@ -78,6 +79,7 @@ def get_chat_members(
                 *"bots"* - bots only,
                 *"recent"* - recent members only,
                 *"administrators"* - chat administrators only.
+                Only applicable to supergroups and channels.
                 Defaults to *"all"*.
 
         .. [1] Server limit: on supergroups, you can get up to 10,000 members for a single query and up to 200 members
@@ -86,7 +88,7 @@ def get_chat_members(
         .. [2] A query string is applicable only for *"all"*, *"kicked"* and *"restricted"* filters only.
 
         Returns:
-            :obj:`ChatMembers`: On success, an object containing a list of chat members is returned.
+            List of :obj:`ChatMember`: On success, a list of chat members is returned.
 
         Raises:
             RPCError: In case of a Telegram RPC error.
@@ -95,14 +97,16 @@ def get_chat_members(
         peer = self.resolve_peer(chat_id)
 
         if isinstance(peer, types.InputPeerChat):
-            return pyrogram.ChatMembers._parse(
-                self,
-                self.send(
-                    functions.messages.GetFullChat(
-                        chat_id=peer.chat_id
-                    )
+            r = self.send(
+                functions.messages.GetFullChat(
+                    chat_id=peer.chat_id
                 )
             )
+
+            members = r.full_chat.participants.participants
+            users = {i.id: i for i in r.users}
+
+            return pyrogram.List(pyrogram.ChatMember._parse(self, member, users) for member in members)
         elif isinstance(peer, types.InputPeerChannel):
             filter = filter.lower()
 
@@ -123,18 +127,20 @@ def get_chat_members(
 
             while True:
                 try:
-                    return pyrogram.ChatMembers._parse(
-                        self,
-                        self.send(
-                            functions.channels.GetParticipants(
-                                channel=peer,
-                                filter=filter,
-                                offset=offset,
-                                limit=limit,
-                                hash=0
-                            )
+                    r = self.send(
+                        functions.channels.GetParticipants(
+                            channel=peer,
+                            filter=filter,
+                            offset=offset,
+                            limit=limit,
+                            hash=0
                         )
                     )
+
+                    members = r.participants
+                    users = {i.id: i for i in r.users}
+
+                    return pyrogram.List(pyrogram.ChatMember._parse(self, member, users) for member in members)
                 except FloodWait as e:
                     log.warning("Sleeping for {}s".format(e.x))
                     time.sleep(e.x)
diff --git a/pyrogram/client/methods/chats/iter_chat_members.py b/pyrogram/client/methods/chats/iter_chat_members.py
@@ -106,7 +106,7 @@ def iter_chat_members(
                     limit=limit,
                     query=q,
                     filter=filter
-                ).chat_members
+                )
 
                 if not chat_members:
                     break
diff --git a/pyrogram/client/types/__init__.py b/pyrogram/client/types/__init__.py
@@ -20,6 +20,8 @@
 from .inline_mode import *
 from .input_media import *
 from .input_message_content import *
+from .list import List
 from .messages_and_media import *
+from .object import Object
 from .update import *
 from .user_and_chats import *
diff --git a/pyrogram/client/types/user_and_chats/__init__.py b/pyrogram/client/types/user_and_chats/__init__.py
@@ -18,7 +18,6 @@
 
 from .chat import Chat
 from .chat_member import ChatMember
-from .chat_members import ChatMembers
 from .chat_permissions import ChatPermissions
 from .chat_photo import ChatPhoto
 from .chat_preview import ChatPreview
@@ -28,6 +27,5 @@
 from .user_status import UserStatus
 
 __all__ = [
-    "Chat", "ChatMember", "ChatMembers", "ChatPermissions", "ChatPhoto", "ChatPreview", "Dialog", "Dialogs", "User",
-    "UserStatus"
+    "Chat", "ChatMember", "ChatPermissions", "ChatPhoto", "ChatPreview", "Dialog", "Dialogs", "User", "UserStatus"
 ]
diff --git a/pyrogram/client/types/user_and_chats/chat_members.py b/pyrogram/client/types/user_and_chats/chat_members.py
