Update methods and types to layer 210

Closes #206

Author: KurimuzonAkuma

compiler/docs/compiler.py

@@ -636,6 +636,7 @@ def get_title_list(s: str) -> list:
             FoundContacts
             PrivacyRule
             StoriesStealthMode
+            UserRating
             BotVerification
             BusinessBotRights
             ChatSettings
@@ -709,6 +710,11 @@ def get_title_list(s: str) -> list:
             Invoice
             LinkPreviewOptions
             GiftCode
+            GiftPurchaseLimit
+            GiftResaleParameters
+            GiftResalePrice
+            GiftResalePriceStar
+            GiftResalePriceTon
             GiftUpgradePreview
             CheckedGiftCode
             ChecklistTask

pyrogram/methods/payments/send_resold_gift.py

@@ -28,7 +28,7 @@ async def send_resold_gift(
         self: "pyrogram.Client",
         gift_link: str,
         new_owner_chat_id: Union[int, str],
-        star_count: int = None
+        price: "types.GiftResalePrice",
     ) -> Optional["types.Message"]:
         """Send an upgraded gift that is available for resale to another user or channel chat.
 
@@ -47,17 +47,21 @@ async def send_resold_gift(
                 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).
 
-            star_count (``int``, *optional*):
-                The amount of Telegram Stars required to pay for the gift.
+            price (:obj:`~pyrogram.types.GiftResalePrice`, *optional*):
+                The price that the user agreed to pay for the gift.
 
         Returns:
             :obj:`~pyrogram.types.Message`: On success, the sent message is returned.
 
         Example:
             .. code-block:: python
 
-                # Transfer gift to another user
-                await app.send_resold_gift(gift_link="https://t.me/nft/NekoHelmet-9215", new_owner_chat_id=123)
+                # Buy gift from telegram market and transfer it to another user
+                await app.send_resold_gift(
+                    gift_link="https://t.me/nft/NekoHelmet-9215",
+                    new_owner_chat_id=123,
+                    price=types.GiftResalePriceStar(star_count=100_000)
+                )
         """
         match = self.UPGRADED_GIFT_RE.match(gift_link)
 
@@ -70,7 +74,8 @@ async def send_resold_gift(
 
         invoice = raw.types.InputInvoiceStarGiftResale(
             slug=match.group(1),
-            to_id=peer
+            to_id=peer,
+            ton=isinstance(price, types.GiftResalePriceTon)
         )
 
         form = await self.invoke(
@@ -79,12 +84,18 @@ async def send_resold_gift(
             )
         )
 
-        if star_count is not None:
-            if star_count < 0:
-                raise ValueError("Invalid amount of Telegram Stars specified.")
+        if isinstance(price, types.GiftResalePriceTon):
+            amount = price.toncoin_cent_count
+        else:
+            amount = price.star_count
 
-            if form.invoice.prices[0].amount > star_count:
-                raise ValueError("Have not enough Telegram Stars.")
+        if amount < 0:
+            raise ValueError("Invalid price specified.")
+
+        if form.invoice.prices[0].amount > amount:
+            raise ValueError("Have not enough {}".format(
+                "Toncoins" if isinstance(price, types.GiftResalePriceTon) else "Telegram Stars"
+            ))
 
         r = await self.invoke(
             raw.functions.payments.SendStarsForm(

pyrogram/methods/payments/set_gift_resale_price.py

@@ -19,14 +19,14 @@
 import re
 
 import pyrogram
-from pyrogram import raw
+from pyrogram import raw, types
 
 
 class SetGiftResalePrice:
     async def set_gift_resale_price(
         self: "pyrogram.Client",
         owned_gift_id: str,
-        resale_star_count: int
+        price: "types.GiftResalePrice" = None,
     ) -> bool:
         """Change resale price of a unique gift owned by the current user.
 
@@ -39,8 +39,9 @@ async def set_gift_resale_price(
                 For a channel gift, you can use the packed format `chatID_savedID` (str).
                 For a upgraded gift, you can use the gift link.
 
-            resale_star_count (``int``):
-                The new price for the unique gift. Pass 0 to disallow gift resale.
+            price (:obj:`~pyrogram.types.GiftResalePrice`, *optional*):
+                The new price for the unique gift.
+                Pass None to disallow gift resale.
 
         Returns:
             ``bool``: On success, True is returned.
@@ -49,7 +50,19 @@ async def set_gift_resale_price(
             .. code-block:: python
 
                 # Change resale price of a unique gift
-                await app.set_gift_resale_price(owned_gift_id="123456", resale_star_count=100)
+                await app.set_gift_resale_price(
+                    owned_gift_id="123456",
+                    price=types.GiftResalePriceStar(star_count=100)
+                )
+
+                # Change resale price of a unique gift to 10 TONs
+                await app.set_gift_resale_price(
+                    owned_gift_id="123456",
+                    price=types.GiftResalePriceTon(toncoin_cent_count=10000000000) # You can use utils.to_nano(10) for same result
+                )
+
+                # Disallow resale of a unique gift
+                await app.set_gift_resale_price(owned_gift_id="123456")
         """
         if not isinstance(owned_gift_id, str):
             raise ValueError(f"owned_gift_id has to be str, but {type(owned_gift_id)} was provided")
@@ -74,7 +87,7 @@ async def set_gift_resale_price(
         await self.invoke(
             raw.functions.payments.UpdateStarGiftPrice(
                 stargift=stargift,
-                resell_amount=raw.types.StarsAmount(amount=resale_star_count, nanos=0)
+                resell_amount=raw.types.StarsAmount(amount=0, nanos=0) if price is None else price.write()
             )
         )
 

pyrogram/types/messages_and_media/__init__.py

@@ -47,6 +47,9 @@
 from .general_forum_topic_hidden import GeneralForumTopicHidden
 from .general_forum_topic_unhidden import GeneralForumTopicUnhidden
 from .gift_code import GiftCode
+from .gift_purchase_limit import GiftPurchaseLimit
+from .gift_resale_parameters import GiftResaleParameters
+from .gift_resale_price import GiftResalePrice, GiftResalePriceStar, GiftResalePriceTon
 from .gift_upgrade_preview import GiftUpgradePreview
 from .invoice import Invoice
 from .link_preview_options import LinkPreviewOptions
@@ -152,6 +155,11 @@
     "GeneralForumTopicHidden",
     "GeneralForumTopicUnhidden",
     "GiftCode",
+    "GiftPurchaseLimit",
+    "GiftResaleParameters",
+    "GiftResalePrice",
+    "GiftResalePriceStar",
+    "GiftResalePriceTon",
     "GiftUpgradePreview",
     "Giveaway",
     "InputChecklistTask",

pyrogram/types/messages_and_media/gift.py

@@ -98,33 +98,31 @@ class Gift(Object):
         transfer_price (``int``, *optional*):
             The number of stars you need to transfer this gift.
 
-        resale_price (``int``, *optional*):
-            Number of Telegram Stars that must be paid to buy the gift and send it to someone else.
-
-        last_resale_star_count (``int``, *optional*):
-            Number of Telegram Stars that were paid by the sender for the gift.
-
-        last_resale_ton_count (``int``, *optional*):
-            Number of TON that were paid by the sender for the gift.
-
         number (``int``, *optional*):
             Unique number of the upgraded gift among gifts upgraded from the same gift.
 
+        total_upgraded_count (``int``, *optional*):
+            Total number of gifts that were upgraded from the same gift.
+
+        max_upgraded_count (``int``, *optional*):
+            The maximum number of gifts that can be upgraded from the same gift.
+
         available_resale_amount (``int``, *optional*):
             The number of gifts available for resale.
             Returned only if is_limited is True.
 
-        available_amount (``int``, *optional*):
-            The number of gifts available for purchase.
-            Returned only if is_limited is True.
+        user_limits (:obj:`~pyrogram.types.GiftPurchaseLimit`, *optional*):
+            Number of times the gift can be purchased by the current user.
 
-        total_amount (``int``, *optional*):
-            Total amount of gifts.
-            Returned only if is_limited is True.
+        overall_limits (:obj:`~pyrogram.types.GiftPurchaseLimit`, *optional*):
+            Number of times the gift can be purchased all users.
 
         publisher_chat (:obj:`~pyrogram.types.Chat`, *optional*):
             Information about the chat that published the gift.
 
+        resale_parameters (:obj:`~pyrogram.types.GiftResaleParameters`, *optional*):
+            Resale parameters of the gift.
+
         can_upgrade (``bool``, *optional*):
             True, if the gift can be upgraded.
 
@@ -162,9 +160,12 @@ class Gift(Object):
         is_transferred (``bool``, *optional*):
             True, if the gift was transferred.
 
-        is_birthday (``bool``, *optional*):
+        is_for_birthday (``bool``, *optional*):
             True, if the gift is a birthday gift.
 
+        is_premium (``bool``, *optional*):
+            True, if the gift can be bought only by Telegram Premium users.
+
         is_pinned (``bool``, *optional*):
             True, if the gift is pinned.
 
@@ -197,19 +198,19 @@ def __init__(
         convert_price: Optional[int] = None,
         upgrade_price: Optional[int] = None,
         transfer_price: Optional[int] = None,
-        resale_price: Optional[int] = None,
-        last_resale_star_count: Optional[int] = None,
-        last_resale_ton_count: Optional[int] = None,
         upgrade_message_id: Optional[int] = None,
         name: Optional[str] = None,
         title: Optional[str] = None,
         collectible_id: Optional[int] = None,
         attributes: Optional[List["types.GiftAttribute"]] = None,
         number: Optional[int] = None,
+        total_upgraded_count: Optional[int] = None,
+        max_upgraded_count: Optional[int] = None,
         available_resale_amount: Optional[int] = None,
-        available_amount: Optional[int] = None,
-        total_amount: Optional[int] = None,
+        user_limits: Optional["types.GiftPurchaseLimit"] = None,
+        overall_limits: Optional["types.GiftPurchaseLimit"] = None,
         publisher_chat: Optional["types.Chat"] = None,
+        resale_parameters: Optional["types.GiftResaleParameters"] = None,
         can_upgrade: Optional[bool] = None,
         can_export_at: Optional[datetime] = None,
         can_transfer_at: Optional[datetime] = None,
@@ -222,7 +223,8 @@ def __init__(
         is_upgraded: Optional[bool] = None,
         is_refunded: Optional[bool] = None,
         is_transferred: Optional[bool] = None,
-        is_birthday: Optional[bool] = None,
+        is_for_birthday: Optional[bool] = None,
+        is_premium: Optional[bool] = None,
         is_pinned: Optional[bool] = None,
         raw: Optional["raw.base.StarGift"] = None
     ):
@@ -245,19 +247,19 @@ def __init__(
         self.convert_price = convert_price
         self.upgrade_price = upgrade_price
         self.transfer_price = transfer_price
-        self.resale_price = resale_price
-        self.last_resale_star_count = last_resale_star_count
-        self.last_resale_ton_count = last_resale_ton_count
         self.upgrade_message_id = upgrade_message_id
         self.name = name
         self.title = title
         self.collectible_id = collectible_id
         self.attributes = attributes
         self.number = number
+        self.total_upgraded_count = total_upgraded_count
+        self.max_upgraded_count = max_upgraded_count
         self.available_resale_amount = available_resale_amount
-        self.available_amount = available_amount
-        self.total_amount = total_amount
+        self.user_limits = user_limits
+        self.overall_limits = overall_limits
         self.publisher_chat = publisher_chat
+        self.resale_parameters = resale_parameters
         self.can_upgrade = can_upgrade
         self.can_export_at = can_export_at
         self.can_transfer_at = can_transfer_at
@@ -270,7 +272,8 @@ def __init__(
         self.is_upgraded = is_upgraded
         self.is_refunded = is_refunded
         self.is_transferred = is_transferred
-        self.is_birthday = is_birthday
+        self.is_for_birthday = is_for_birthday
+        self.is_premium = is_premium
         self.is_pinned = is_pinned
         self.raw = raw
 
@@ -304,12 +307,13 @@ async def _parse_regular(
             price=star_gift.stars,
             convert_price=star_gift.convert_stars,
             upgrade_price=star_gift.upgrade_stars,
-            available_amount=star_gift.availability_remains,
             available_resale_amount=star_gift.availability_resale,
-            total_amount=star_gift.availability_total,
+            user_limits=types.GiftPurchaseLimit._parse(star_gift.per_user_total, star_gift.per_user_remains),
+            overall_limits=types.GiftPurchaseLimit._parse(star_gift.availability_total, star_gift.availability_remains),
             is_limited=star_gift.limited,
             is_sold_out=star_gift.sold_out,
-            is_birthday=star_gift.birthday,
+            is_for_birthday=star_gift.birthday,
+            is_premium=star_gift.require_premium,
             first_sale_date=utils.timestamp_to_datetime(star_gift.first_sale_date),
             last_sale_date=utils.timestamp_to_datetime(star_gift.last_sale_date),
             publisher_chat=types.Chat._parse_chat(client, chats.get(utils.get_raw_peer_id(star_gift.released_by))),
@@ -329,16 +333,6 @@ async def _parse_unique(
 
         owner_id = utils.get_raw_peer_id(star_gift.owner_id)
 
-        last_resale_star_count = None
-        last_resale_ton_count = None
-
-        if star_gift.resell_amount:
-            for currency in star_gift.resell_amount:
-                if isinstance(currency, raw.types.StarsAmount):
-                    last_resale_star_count = currency.amount
-                elif isinstance(currency, raw.types.StarsTonAmount):
-                    last_resale_ton_count = currency.amount
-
         return Gift(
             id=star_gift.id,
             name=star_gift.slug,
@@ -348,13 +342,14 @@ async def _parse_unique(
                 [await types.GiftAttribute._parse(client, attr, users, chats) for attr in star_gift.attributes]
             ) or None,
             number=star_gift.availability_issued,
-            total_amount=star_gift.availability_total,
+            total_upgraded_count=star_gift.availability_total,
+            max_upgraded_count=star_gift.availability_issued,
+            is_premium=star_gift.require_premium,
             owner=types.Chat._parse_chat(client, users.get(owner_id) or chats.get(owner_id)),
             owner_name=star_gift.owner_name,
             owner_address=star_gift.owner_address,
             gift_address=star_gift.gift_address,
-            last_resale_star_count=last_resale_star_count,
-            last_resale_ton_count=last_resale_ton_count,
+            resale_parameters=types.GiftResaleParameters._parse(star_gift.resell_amount, star_gift.resale_ton_only),
             publisher_chat=types.Chat._parse_chat(client, chats.get(utils.get_raw_peer_id(star_gift.released_by))),
             is_upgraded=True,
             raw=star_gift,
@@ -626,7 +621,7 @@ async def wear(self) -> bool:
             )
         )
 
-    async def buy(self, new_owner_chat_id: Optional[Union[int, str]] = None, star_count: Optional[int] = None) -> Optional["types.Message"]:
+    async def buy(self, new_owner_chat_id: Optional[Union[int, str]] = None, price: Optional["types.GiftResalePrice"] = None) -> Optional["types.Message"]:
         """Bound method *buy* of :obj:`~pyrogram.types.Gift`.
 
         .. note::
@@ -650,10 +645,16 @@ async def buy(self, new_owner_chat_id: Optional[Union[int, str]] = None, star_co
         if new_owner_chat_id is None:
             new_owner_chat_id = "me"
 
+        if price is None:
+            if self.resale_parameters.toncoin_only:
+                price = types.GiftResalePriceTon(toncoin_cent_count=self.resale_parameters.toncoin_cent_count)
+            else:
+                price = types.GiftResalePriceStar(star_count=self.resale_parameters.star_count)
+
         return await self._client.send_resold_gift(
             gift_link=self.link,
             new_owner_chat_id=new_owner_chat_id,
-            star_count=star_count
+            price=price
         )
 
     async def send(