Merge 36e7d8b13b into cb38d6a02b

pyrogram/methods/payments/send_gift.py

@@ -77,8 +77,7 @@ class SendGift:
         """
         peer = await self.resolve_peer(chat_id)
 
-        result = await utils.parse_text_entities(self, text, parse_mode, entities)
+        text, entities = (await utils.parse_text_entities(self, text, parse_mode, entities)).values()
-        text, entities = result["message"], result["entities"]
 
         invoice = raw.types.InputInvoiceStarGift(
             peer=peer,

pyrogram/utils.py

@@ -436,15 +436,13 @@ async def parse_text_entities(
     entities: List["types.MessageEntity"]
 ) -> Dict[str, Union[str, List[raw.base.MessageEntity]]]:
     if entities:
-      
+        # Inject the client instance because parsing user mentions requires it
         for entity in entities:
             entity._client = client
 
-        text, entities = text, [await entity.write() for entity in entities] or []
+        text, entities = text, [await entity.write() for entity in entities] or None
     else:
-        parsed = await client.parser.parse(text, parse_mode)
+        text, entities = (await client.parser.parse(text, parse_mode)).values()
-        
-        text, entities = parsed["message"], parsed.get("entities") or []
 
     return {
         "message": text,