Merge develop -> asyncio

pyrogram/__init__.py

@@ -16,19 +16,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-import sys
-
-if sys.version_info[:3] in [(3, 5, 0), (3, 5, 1), (3, 5, 2)]:
-    from .vendor import typing
-
-    # Monkey patch the standard "typing" module because Python versions from 3.5.0 to 3.5.2 have a broken one.
-    sys.modules["typing"] = typing
-
 __version__ = "0.16.0.asyncio-dev"
 __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)"
 __copyright__ = "Copyright (C) 2017-2019 Dan <https://github.com/delivrance>"
 
-from .errors import RPCError
 from .client import *
 from .client.handlers import *
 from .client.types import *

pyrogram/client/methods/users/__init__.py

@@ -18,6 +18,7 @@
 
 from .block_user import BlockUser
 from .delete_profile_photos import DeleteProfilePhotos
+from .get_common_chats import GetCommonChats
 from .get_me import GetMe
 from .get_profile_photos import GetProfilePhotos
 from .get_profile_photos_count import GetProfilePhotosCount
@@ -30,6 +31,7 @@ from .update_username import UpdateUsername
 
 class Users(
     BlockUser,
+    GetCommonChats,
     GetProfilePhotos,
     SetProfilePhoto,
     DeleteProfilePhotos,

pyrogram/client/methods/users/get_common_chats.py

@@ -0,0 +1,62 @@
+# Pyrogram - Telegram MTProto API Client Library for Python
+# Copyright (C) 2017-2019 Dan Tès <https://github.com/delivrance>
+#
+# This file is part of Pyrogram.
+#
+# Pyrogram is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pyrogram is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
+
+from typing import Union
+
+import pyrogram
+from pyrogram.api import functions, types
+from ...ext import BaseClient
+
+
+class GetCommonChats(BaseClient):
+    def get_common_chats(self, user_id: Union[int, str]) -> list:
+        """Get the common chats you have with a user.
+
+        Parameters:
+            user_id (``int`` | ``str``):
+                Unique identifier (int) or username (str) of the target chat.
+                For your personal cloud (Saved Messages) you can simply use "me" or "self".
+                For a contact that exists in your Telegram address book you can use his phone number (str).
+
+        Returns:
+            List of :obj:`Chat`: On success, a list of the common chats is returned.
+            
+        Raises:
+            ValueError: If the user_id doesn't belong to a user.
+
+        Example:
+            .. code-block:: python
+
+                common = app.get_common_chats("haskell")
+                print(common)
+        """
+
+        peer = self.resolve_peer(user_id)
+
+        if isinstance(peer, types.InputPeerUser):
+            r = self.send(
+                functions.messages.GetCommonChats(
+                    user_id=peer,
+                    max_id=0,
+                    limit=100,
+                )
+            )
+
+            return pyrogram.List([pyrogram.Chat._parse_chat(self, x) for x in r.chats])
+        
+        raise ValueError('The user_id "{}" doesn\'t belong to a user'.format(user_id))

pyrogram/vendor/__init__.py

@@ -1,19 +0,0 @@
-# Pyrogram - Telegram MTProto API Client Library for Python
-# Copyright (C) 2017-2019 Dan Tès <https://github.com/delivrance>
-#
-# This file is part of Pyrogram.
-#
-# Pyrogram is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pyrogram is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
-
-from .typing import typing

pyrogram/vendor/typing/__init__.py

@@ -1,17 +0,0 @@
-# Pyrogram - Telegram MTProto API Client Library for Python
-# Copyright (C) 2017-2019 Dan Tès <https://github.com/delivrance>
-#
-# This file is part of Pyrogram.
-#
-# Pyrogram is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pyrogram is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.