Changed types in UpgradedGift and UserGift, according to Layer 197.

Author: SpEcHiDe

docs/source/releases/changes-in-this-fork.rst

@@ -26,6 +26,7 @@ Changes in this Fork
 | Scheme layer used: 198 |
 +------------------------+
 
+- Changed types in :obj:`~pyrogram.types.UpgradedGift`, :obj:`~pyrogram.types.UserGift`.
 - PR from upstream: `701 <https://github.com/pyrogram/pyrogram/pull/701>`_
 - View `new and changed <https://telegramplayground.github.io/TG-APIs/TL/diff/tdlib.html?from=196&to=198>`__ `raw API methods <https://telegramplayground.github.io/TG-APIs/TL/diff/tdesktop.html?from=196&to=198>`__.
 

pyrogram/methods/business/get_available_gifts.py

@@ -42,4 +42,7 @@ async def get_available_gifts(
             raw.functions.payments.GetStarGifts(hash=0)
         )
 
-        return types.List([await types.Gift._parse(self, gift) for gift in r.gifts])
+        return types.List([
+            await types.Gift._parse(self, gift, {})
+            for gift in r.gifts
+        ])

pyrogram/methods/business/get_user_gifts.py

@@ -72,10 +72,10 @@ async def get_user_gifts(
             )
 
             users = {u.id: u for u in r.users}
-            # TODO
+            chats = {c.id: c for c in r.chats}
 
             user_gifts = [
-                await types.UserGift._parse(self, gift, users)
+                await types.UserGift._parse(self, gift, users, chats)
                 for gift in r.gifts
             ]
 

pyrogram/types/messages_and_media/gift.py

@@ -102,9 +102,10 @@ def __init__(
     async def _parse(
         client,
         star_gift: "raw.base.StarGift",
+        users: dict
     ) -> Union["Gift", "types.UpgradedGift"]:
         if isinstance(star_gift, raw.types.StarGiftUnique):
-            return types.UpgradedGift._parse(client, star_gift)
+            return types.UpgradedGift._parse(client, star_gift, users)
 
         doc = star_gift.sticker
         attributes = {type(i): i for i in doc.attributes}

pyrogram/types/messages_and_media/message.py

@@ -1013,7 +1013,7 @@ async def _parse(
                 isinstance(action, raw.types.MessageActionStarGift) or
                 isinstance(action, raw.types.MessageActionStarGiftUnique)
             ):
-                user_gift = await types.UserGift._parse_action(client, message, users)
+                user_gift = await types.UserGift._parse_action(client, message, users, chats)
                 service_type = enums.MessageServiceType.USER_GIFT
 
             parsed_message = Message(

pyrogram/types/messages_and_media/upgraded_gift.py

@@ -19,7 +19,7 @@
 from typing import Optional
 
 import pyrogram
-from pyrogram import raw, utils
+from pyrogram import raw, types, utils
 from ..object import Object
 
 
@@ -33,6 +33,9 @@ class UpgradedGift(Object):
         title (``str``):
             The title of the upgraded gift.
 
+        name (``str``):
+            Unique name of the upgraded gift.
+
         number (``int``):
             Unique number of the upgraded gift among gifts upgraded from the same gift.
 
@@ -42,11 +45,17 @@ class UpgradedGift(Object):
         max_upgraded_count (``int``):
             The maximum number of gifts that can be upgraded from the same gift.
 
-        owner_user_id (``int``, *optional*):
-            User identifier of the user that owns the upgraded gift.
+        owner_id (:obj:`~pyrogram.types.User`, *optional*):
+            User identifier of the user or the chat that owns the upgraded gift; may be None if unknown.
+
+        owner_address (``str``, *optional*):
+            Address of the gift NFT owner in TON blockchain.
 
-        owner_user_name (``str``, *optional*):
-            User name of the user that owns the upgraded gift.
+        owner_name (``str``, *optional*):
+            Name of the owner for the case when owner identifier and address aren't known.
+
+        link (``str``, *property*):
+            The link is a link to an upgraded gift.
 
     """
 
@@ -56,38 +65,53 @@ def __init__(
         client: "pyrogram.Client" = None,
         id: int,
         title: str,
+        name: str,
         number: int,
         total_upgraded_count: int,
         max_upgraded_count: int,
-        owner_user_id: Optional[int] = None,
-        owner_user_name: Optional[str] = None,
+        owner_id: Optional["types.Chat"] = None,
+        owner_address: Optional[str] = None,
+        owner_name: Optional[str] = None,
         _raw: "raw.types.StarGiftUnique" = None,
     ):
         super().__init__(client)
 
         self.id = id
         self.title = title
+        self.name = name
         self.number = number
         self.total_upgraded_count = total_upgraded_count
         self.max_upgraded_count = max_upgraded_count
-        self.owner_user_id = owner_user_id
-        self.owner_user_name = owner_user_name
+        self.owner_id = owner_id
+        self.owner_address = owner_address
+        self.owner_name = owner_name
         self._raw = _raw  # TODO
 
 
     @staticmethod
     def _parse(
         client,
-        star_gift: "raw.types.StarGiftUnique"
+        star_gift: "raw.types.StarGiftUnique",
+        users: dict
     ) -> "UpgradedGift":
+        owner_id = utils.get_raw_peer_id(getattr(star_gift, "owner_id", None))
         return UpgradedGift(
             id=star_gift.id,
             title=star_gift.title,
+            name=star_gift.slug,
             number=star_gift.num,
             total_upgraded_count=star_gift.availability_issued,
             max_upgraded_count=star_gift.availability_total,
-            owner_user_id=utils.get_raw_peer_id(getattr(star_gift, "owner_id", None)),
-            owner_user_name=getattr(star_gift, "owner_name", None),
+            owner_id=types.Chat._parse_user_chat(
+                client,
+                users.get(owner_id, owner_id)
+            ),
+            owner_address=getattr(star_gift, "owner_address", None),
+            owner_name=getattr(star_gift, "owner_name", None),
             _raw=star_gift,
             client=client
         )
+
+    @property
+    def link(self) -> str:
+        return f"https://t.me/nft/{self.name}"

pyrogram/types/messages_and_media/user_gift.py

@@ -124,20 +124,29 @@ def __init__(
     async def _parse(
         client,
         saved_star_gift: "raw.types.SavedStarGift",
-        users: dict
+        users: dict,
+        chats: dict
     ) -> "UserGift":
         text, entities = None, None
         if getattr(saved_star_gift, "message", None):
             text = saved_star_gift.message.text or None
             entities = [types.MessageEntity._parse(client, entity, users) for entity in saved_star_gift.message.entities]
             entities = types.List(filter(lambda x: x is not None, entities))
         # TODO refunded:flags.9?true can_upgrade:flags.10?true msg_id:flags.3?int saved_id:flags.11?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long
+        sender_user = utils.get_raw_peer_id(saved_star_gift.from_id)
         return UserGift(
             date=utils.timestamp_to_datetime(saved_star_gift.date),
-            gift=await types.Gift._parse(client, saved_star_gift.gift),
+            gift=await types.Gift._parse(
+                client,
+                saved_star_gift.gift,
+                users
+            ),
             is_private=getattr(saved_star_gift, "name_hidden", None),
             is_saved=not saved_star_gift.unsaved if getattr(saved_star_gift, "unsaved", None) else None,
-            sender_user=types.User._parse(client, users.get(saved_star_gift.from_id)) if getattr(saved_star_gift, "from_id", None) else None,
+            sender_user=types.User._parse(
+                client,
+                users.get(sender_user)
+            ) if sender_user else None,
             message_id=getattr(saved_star_gift, "msg_id", None),
             sell_star_count=getattr(saved_star_gift, "convert_stars", None),
             text=Str(text).init(entities) if text else None,
@@ -149,7 +158,8 @@ async def _parse(
     async def _parse_action(
         client,
         message: "raw.base.Message",
-        users: dict
+        users: dict,
+        chats: dict
     ) -> "UserGift":
         action = message.action
 
@@ -161,7 +171,11 @@ async def _parse_action(
         # TODO 
         if isinstance(action, raw.types.MessageActionStarGift):
             return UserGift(
-                gift=await types.Gift._parse(client, action.gift),
+                gift=await types.Gift._parse(
+                    client,
+                    action.gift,
+                    users
+                ),
                 date=utils.timestamp_to_datetime(message.date),
                 is_private=getattr(action, "name_hidden", None),
                 is_saved=getattr(action, "saved", None),
@@ -179,7 +193,11 @@ async def _parse_action(
 
         if isinstance(action, raw.types.MessageActionStarGiftUnique):
             return UserGift(
-                gift=await types.Gift._parse(client, action.gift),
+                gift=await types.Gift._parse(
+                    client,
+                    action.gift,
+                    users
+                ),
                 date=utils.timestamp_to_datetime(message.date),
                 sender_user=types.User._parse(client, users.get(utils.get_raw_peer_id(message.peer_id))),
                 message_id=message.id,