Merge remote-tracking branch 'KurimuzonAkuma/dev' into dev

# Conflicts:
#	pyproject.toml
#	pyrogram/client.py
#	pyrogram/enums/__init__.py

Author: SychO3

compiler/api/source/main_api.tl

@@ -243,6 +243,7 @@ def get_title_list(s: str) -> list:
             send_voice
             send_video_note
             send_media_group
+            send_message_draft
             send_location
             send_venue
             send_contact
@@ -432,6 +433,7 @@ def get_title_list(s: str) -> list:
             add_contact
             delete_contacts
             import_contacts
+            get_blocked_message_senders
             get_contacts
             get_contacts_count
             search_contacts
@@ -460,6 +462,8 @@ def get_title_list(s: str) -> list:
             set_gift_collection_name
             get_gift_upgrade_preview
             get_gift_upgrade_variants
+            get_gifts_for_crafting
+            craft_gift
             get_payment_form
             get_stars_balance
             get_ton_balance
@@ -714,6 +718,9 @@ def get_title_list(s: str) -> list:
             Voice
             VideoNote
             Contact
+            CraftGiftResult
+            CraftGiftResultSuccess
+            CraftGiftResultFail
             Location
             MaskPosition
             MediaArea
@@ -749,7 +756,7 @@ def get_title_list(s: str) -> list:
             Invoice
             LinkPreviewOptions
             GiftCollection
-            GiftCode
+            PremiumGiftCode
             GiftPurchaseLimit
             GiftResaleParameters
             GiftResalePrice
@@ -789,6 +796,8 @@ def get_title_list(s: str) -> list:
             SavedCredentials
             PaymentResult
             ChatBoost
+            ChatOwnerChanged
+            ChatOwnerLeft
             ContactRegistered
             ScreenshotTaken
             StarAmount
@@ -807,6 +816,12 @@ def get_title_list(s: str) -> list:
             UpgradedGiftAttributeIdModel
             UpgradedGiftAttributeIdSymbol
             UpgradedGiftAttributeIdBackdrop
+            UpgradedGiftAttributeRarity
+            UpgradedGiftAttributeRarityPerMille
+            UpgradedGiftAttributeRarityUncommon
+            UpgradedGiftAttributeRarityRare
+            UpgradedGiftAttributeRarityEpic
+            UpgradedGiftAttributeRarityLegendary
             UpgradedGiftOriginalDetails
             InputChatPhoto
             InputChatPhotoPrevious
@@ -1187,7 +1202,9 @@ def get_title_list(s: str) -> list:
     categories = dict(
         enums="""
         Enumerations
+            BlockList
             BusinessSchedule
+            ButtonStyle
             ChatAction
             ChatEventAction
             ChatJoinType
@@ -1213,6 +1230,7 @@ def get_title_list(s: str) -> list:
             SentCodeType
             StoriesPrivacyRules
             UserStatus
+            UpgradedGiftOrigin
             GiftAttributeType
             MediaAreaType
             PrivacyRuleType

compiler/docs/compiler.py

@@ -400,7 +400,7 @@ POLL_OPTION_INVALID	IA poll option used invalid data (the data may be too long).
 POLL_QUESTION_INVALID	The poll question is invalid.
 POLL_UNSUPPORTED	This layer does not support polls in the invoked method.
 POLL_VOTE_REQUIRED	Cast a vote in the poll before calling this method.
-PRECHECKOUT_FAILED	Precheckout failed.
+PRECHECKOUT_FAILED	Precheckout failed. Probably you don't have enough funds to complete the purchase.
 PREMIUM_ACCOUNT_REQUIRED	A premium account is required to execute this action.
 PREMIUM_GIFTCODE_WAS_REFUNDED	This gift code can't be redeemed because the giveaway organizer requested a refund.
 PRICING_CHAT_INVALID	The pricing for the [subscription](https://core.telegram.org/api/subscriptions) is invalid, the maximum price is specified in the [`stars_subscription_amount_max` config key »](https://core.telegram.org/api/config#stars-subscription-amount-max).
@@ -644,4 +644,4 @@ WEBPAGE_URL_INVALID	The specified webpage `url` is invalid.
 WEBPUSH_AUTH_INVALID	The specified web push authentication secret is invalid.
 WEBPUSH_KEY_INVALID	The specified web push elliptic curve Diffie-Hellman public key is invalid.
 WEBPUSH_TOKEN_INVALID	The specified web push token is invalid.
-YOU_BLOCKED_USER	You blocked this user.
+YOU_BLOCKED_USER	You blocked this user.

compiler/errors/source/400_BAD_REQUEST.tsv

@@ -16,7 +16,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "2.2.17"
+__version__ = "2.2.19"
 __license__ = "GNU Lesser General Public License v3.0 (LGPL-3.0)"
 __copyright__ = "Copyright (C) 2017-present Dan <https://github.com/delivrance>"
 

pyrogram/__init__.py

@@ -5,12 +5,12 @@
 #
 #  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 我给他職5日4还有个63 摩羯男 Foundation, either version 3 of the License, or
+#  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 FOR5A PARTICULAR PURPOSE.  See the
+#  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
@@ -119,9 +119,10 @@ class Client(Methods):
             after which the server address will be updated (works both ways).
             Defaults to False (IPv4).
 
-        proxy (``dict``, *optional*):
+        proxy (``dict`` | ``str``, *optional*):
             The Proxy settings as dict.
-            E.g.: *dict(scheme="socks5", hostname="11.22.33.44", port=1234, username="user", password="pass")*.
+            E.g.: *dict(scheme="socks5", hostname="11.22.33.44", port=1234, username="user", password="pass")*
+            or *"http://11.22.33.44:1234"* or *"socks5://user:pass@11.22.33.44:1234"*.
             The *username* and *password* can be omitted if the proxy doesn't require authorization.
 
         test_mode (``bool``, *optional*):
@@ -180,6 +181,7 @@ class Client(Methods):
 
         skip_updates (``bool``, *optional*):
             Pass True to skip pending updates that arrived while the client was offline.
+            Doesn't work if *in_memory* is set to True.
             Defaults to True.
 
         takeout (``bool``, *optional*):
@@ -287,7 +289,7 @@ def __init__(
         lang_code: str = LANG_CODE,
         system_lang_code: str = SYSTEM_LANG_CODE,
         ipv6: Optional[bool] = False,
-        proxy: Optional[dict] = None,
+        proxy: Optional[Union[dict, str]] = None,
         test_mode: Optional[bool] = False,
         bot_token: Optional[str] = None,
         session_string: Optional[str] = None,
@@ -382,10 +384,7 @@ def __init__(
         self.dispatcher: Dispatcher = Dispatcher(self)
 
         self.rnd_id = MsgId
-        self._last_sync_time = time.time()
-        self._last_monotonic = time.monotonic()
-
-        self._is_server_time_synced = False
+        self._server_time_offset = 0.0
 
         self.parser: Parser = Parser(self)
 
@@ -425,10 +424,20 @@ def __init__(
         if isinstance(loop, asyncio.AbstractEventLoop):
             self.loop = loop
         else:
-            self.loop = utils.get_event_loop()
+            self.loop = None
 
         self.__config: "raw.types.Config" = None
 
+    @property
+    def loop(self) -> asyncio.AbstractEventLoop:
+        if not self._loop:
+            self._loop = utils.get_event_loop()
+        return self._loop
+
+    @loop.setter
+    def loop(self, value: asyncio.AbstractEventLoop):
+        self._loop = value
+
         self.listeners = {listener_type: [] for listener_type in pyrogram.enums.ListenerTypes}
 
         self.listeners = {listener_type: [] for listener_type in pyrogram.enums.ListenerTypes}
@@ -633,12 +642,12 @@ async def authorize(self) -> User:
         return signed_up
 
     async def authorize_qr(self, except_ids: List[int] = []) -> "User":
-        import qrcode
+        from qrcode import QRCode
 
         qr_login = QRLogin(self, except_ids)
         await qr_login.recreate()
 
-        qr = qrcode.QRCode(version=1)
+        qr = QRCode(version=1)
 
         while True:
             try:
@@ -822,7 +831,7 @@ async def handle_updates(self, updates):
                 pts = getattr(update, "pts", None)
                 pts_count = getattr(update, "pts_count", None)
 
-                if pts and not self.skip_updates:
+                if pts:
                     await self.storage.update_state(
                         (
                             utils.get_channel_id(channel_id) if channel_id else 0,
@@ -864,16 +873,15 @@ async def handle_updates(self, updates):
 
                 self.dispatcher.updates_queue.put_nowait((update, users, chats))
         elif isinstance(updates, (raw.types.UpdateShortMessage, raw.types.UpdateShortChatMessage)):
-            if not self.skip_updates:
-                await self.storage.update_state(
-                    (
-                        0,
-                        updates.pts,
-                        None,
-                        updates.date,
-                        None
-                    )
+            await self.storage.update_state(
+                (
+                    0,
+                    updates.pts,
+                    None,
+                    updates.date,
+                    None
                 )
+            )
 
             diff = await self.invoke(
                 raw.functions.updates.GetDifference(
@@ -1536,16 +1544,12 @@ async def set_dc(
 
     @property
     def server_time(self) -> float:
-        return self._last_sync_time + (time.monotonic() - self._last_monotonic)
+        return time.time() + self._server_time_offset
 
     def _set_server_time(self, msg_id: int):
-        if self._is_server_time_synced:
-            return
-
-        self._last_sync_time = msg_id / float(2**32)
-        self._last_monotonic = time.monotonic()
-        self._is_server_time_synced = True
-        log.info(f"Time synced: {utils.timestamp_to_datetime(self._last_sync_time)}")
+        server_ts = msg_id / float(2**32)
+        self._server_time_offset = server_ts - time.time()
+        log.info(f"Time synced: offset={self._server_time_offset:.3f}s, server_time={utils.timestamp_to_datetime(server_ts)}")
 
     def guess_mime_type(self, filename: Union[str, BytesIO]) -> Optional[str]:
         if isinstance(filename, BytesIO):

pyrogram/client.py

@@ -18,7 +18,7 @@
 
 import asyncio
 import logging
-from typing import Optional, Type
+from typing import Optional, Type, Union
 
 from pyrogram import utils
 
@@ -36,7 +36,7 @@ def __init__(
         server_address: str,
         port: int,
         test_mode: bool,
-        proxy: dict,
+        proxy: Optional[Union[dict, str]] = None,
         media: bool = False,
         protocol_factory: Type[TCP] = TCPAbridged,
         crypto_executor_workers: int = 1,