Merge develop -> asyncio

delivrance · delivrance · commit b10817ec2967 · 2019-09-09T16:00:38.000+02:00
diff --git a/compiler/docs/compiler.py b/compiler/docs/compiler.py
@@ -184,6 +184,7 @@ def get_title_list(s: str) -> list:
             unban_chat_member
             restrict_chat_member
             promote_chat_member
+            set_administrator_title
             export_chat_invite_link
             set_chat_photo
             delete_chat_photo
diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
@@ -1433,10 +1433,7 @@ def load_config(self):
                 self.api_id = parser.getint("pyrogram", "api_id")
                 self.api_hash = parser.get("pyrogram", "api_hash")
             else:
-                raise AttributeError(
-                    "No API Key found. "
-                    "More info: https://docs.pyrogram.org/intro/setup#configuration"
-                )
+                raise AttributeError("No API Key found. More info: https://docs.pyrogram.org/intro/setup")
 
         for option in ["app_version", "device_model", "system_version", "lang_code"]:
             if getattr(self, option):
diff --git a/pyrogram/client/methods/chats/__init__.py b/pyrogram/client/methods/chats/__init__.py
@@ -40,11 +40,11 @@
 from .pin_chat_message import PinChatMessage
 from .promote_chat_member import PromoteChatMember
 from .restrict_chat_member import RestrictChatMember
+from .set_administrator_title import SetAdministratorTitle
 from .set_chat_description import SetChatDescription
 from .set_chat_permissions import SetChatPermissions
 from .set_chat_photo import SetChatPhoto
 from .set_chat_title import SetChatTitle
-from .set_custom_title import SetCustomTitle
 from .unarchive_chats import UnarchiveChats
 from .unban_chat_member import UnbanChatMember
 from .unpin_chat_message import UnpinChatMessage
@@ -84,6 +84,6 @@ class Chats(
     DeleteChannel,
     DeleteSupergroup,
     GetNearbyChats,
-    SetCustomTitle
+    SetAdministratorTitle
 ):
     pass
diff --git a/pyrogram/client/methods/chats/create_channel.py b/pyrogram/client/methods/chats/create_channel.py
@@ -30,7 +30,7 @@ def create_channel(
         """Create a new broadcast channel.
 
         Parameters:
-            title (``title``):
+            title (``str``):
                 The channel title.
 
             description (``str``, *optional*):
diff --git a/pyrogram/client/methods/chats/create_group.py b/pyrogram/client/methods/chats/create_group.py
@@ -36,7 +36,7 @@ def create_group(
             If you want to create a new supergroup, use :meth:`~pyrogram.Client.create_supergroup` instead.
 
         Parameters:
-            title (``title``):
+            title (``str``):
                 The group title.
 
             users (``int`` | ``str`` | List of ``int`` or ``str``):
diff --git a/pyrogram/client/methods/chats/create_supergroup.py b/pyrogram/client/methods/chats/create_supergroup.py
@@ -34,7 +34,7 @@ def create_supergroup(
             If you want to create a new basic group, use :meth:`~pyrogram.Client.create_group` instead.
 
         Parameters:
-            title (``title``):
+            title (``str``):
                 The supergroup title.
 
             description (``str``, *optional*):
diff --git a/pyrogram/client/methods/chats/iter_dialogs.py b/pyrogram/client/methods/chats/iter_dialogs.py
@@ -18,9 +18,9 @@
 
 from typing import Generator, Optional
 
-import pyrogram
 from async_generator import async_generator, yield_
 
+import pyrogram
 from ...ext import BaseClient
 
 
@@ -38,7 +38,7 @@ async def iter_dialogs(
         single call.
 
         Parameters:
-            limit (``str``, *optional*):
+            limit (``int``, *optional*):
                 Limits the number of dialogs to be retrieved.
                 By default, no limit is applied and all dialogs are returned.
 
diff --git a/pyrogram/client/methods/chats/join_chat.py b/pyrogram/client/methods/chats/join_chat.py
@@ -58,20 +58,9 @@ async def join_chat(
             elif isinstance(chat.chats[0], types.Channel):
                 return pyrogram.Chat._parse_channel_chat(self, chat.chats[0])
         else:
-            resolved_peer = await self.send(
-                functions.contacts.ResolveUsername(
-                    username=chat_id.lower().strip("@")
-                )
-            )
-
-            channel = types.InputPeerChannel(
-                channel_id=resolved_peer.chats[0].id,
-                access_hash=resolved_peer.chats[0].access_hash
-            )
-
             chat = await self.send(
                 functions.channels.JoinChannel(
-                    channel=channel
+                    channel=await self.resolve_peer(chat_id)
                 )
             )
 
diff --git a/pyrogram/client/methods/chats/set_administrator_title.py b/pyrogram/client/methods/chats/set_administrator_title.py
@@ -22,14 +22,17 @@
 from ...ext import BaseClient
 
 
-class SetCustomTitle(BaseClient):
-    async def set_custom_title(
+class SetAdministratorTitle(BaseClient):
+    async def set_administrator_title(
         self,
         chat_id: Union[int, str],
         user_id: Union[int, str],
         title: str,
     ) -> bool:
-        """Set a custom title to administrators or owners of a supergroup.
+        """Set a custom title (rank) to an administrator of a supergroup.
+
+        If you are an administrator of a supergroup (i.e. not the owner), you can only set the title of other
+        administrators who have been promoted by you. If you are the owner, you can change every administrator's title.
 
         Parameters:
             chat_id (``int`` | ``str``):
@@ -49,8 +52,7 @@ async def set_custom_title(
         Example:
             .. code-block:: python
 
-                # Set custom titles to owners or administrators of supergroups
-                app.set_custom_title(chat_id, user_id, "Custom Title")
+                app.set_administrator_title(chat_id, user_id, "ฅ^•ﻌ•^ฅ")
         """
         chat_id = await self.resolve_peer(chat_id)
         user_id = await self.resolve_peer(user_id)
diff --git a/pyrogram/client/storage/file_storage.py b/pyrogram/client/storage/file_storage.py
@@ -108,7 +108,10 @@ def open(self):
             self.create()
 
         with self.conn:
-            self.conn.execute("VACUUM")
+            try:  # Python 3.6.0 (exactly this version) is bugged and won't successfully execute the vacuum
+                self.conn.execute("VACUUM")
+            except sqlite3.OperationalError:
+                pass
 
     def destroy(self):
         os.remove(self.database)
