pyrofork: Fix star_gift parser

Mayuri-Chan · Jan 4, 2025 · 51a0520 · 51a0520
1 parent 9efa6dc
commit 51a0520
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/compiler/docs/compiler.py b/compiler/docs/compiler.py
@@ -588,7 +588,7 @@ def get_title_list(s: str) -> list:
             GiftCode
             GiftedPremium
             Gift
-            UserGift
+            StarGift
             InputStarsTransaction
             Invoice
             LabeledPrice
@@ -600,7 +600,6 @@ def get_title_list(s: str) -> list:
             StarsStatus
             StarsTransaction
             SuccessfulPayment
-            UserStarGift
         """,
         pyromod="""
         Pyromod
@@ -928,4 +927,4 @@ def start():
     DESTINATION = "../../docs/source/telegram"
     PYROGRAM_API_DEST = "../../docs/source/api"
 
-    start()
+    start()
diff --git a/pyrogram/types/payments/star_gift.py b/pyrogram/types/payments/star_gift.py
@@ -238,7 +238,7 @@ async def _parse_user_star_gift(
         users: dict
     ) -> "StarGift":
         caption, caption_entities = (
-            utils.parse_text_entities(
+            utils.parse_text_with_entities(
                 client, getattr(user_star_gift, "message", None), users
             )
         ).values()
@@ -320,7 +320,7 @@ async def _parse_action(
         action = message.action  # type: raw.types.MessageActionStarGift
 
         caption, caption_entities = (
-            utils.parse_text_entities(
+            utils.parse_text_with_entities(
                 client, getattr(action, "message", None), users
             )
         ).values()

diff --git a/pyrogram/utils.py b/pyrogram/utils.py
@@ -30,8 +30,8 @@
 from types import SimpleNamespace
 
 import pyrogram
-from pyrogram import raw, enums
-from pyrogram import types
+from pyrogram import raw, enums, types
+from pyrogram.types.messages_and_media.message import Str
 from pyrogram.file_id import FileId, FileType, PHOTO_TYPES, DOCUMENT_TYPES
 
 
@@ -477,6 +477,22 @@ async def run_sync(func: Callable[..., TypeVar("Result")], *args: Any, **kwargs:
     loop = asyncio.get_event_loop()
     return await loop.run_in_executor(None, functools.partial(func, *args, **kwargs))
 
+def parse_text_with_entities(client, message: "raw.types.TextWithEntities", users):
+    entities = types.List(
+        filter(
+            lambda x: x is not None,
+            [
+                types.MessageEntity._parse(client, entity, users)
+                for entity in getattr(message, "entities", [])
+            ]
+        )
+    )
+
+    return {
+        "text": Str(getattr(message, "text", "")).init(entities) or None,
+        "entities": entities or None
+    }
+
 async def get_reply_to(
     client: "pyrogram.Client",
     chat_id: Union[int,str] = None,