Fix message entity parsing and serialization

delivrance · delivrance · commit ed008dd3bb9e · 2022-08-28T20:32:43.000+02:00
diff --git a/pyrogram/methods/messages/send_message.py b/pyrogram/methods/messages/send_message.py
@@ -159,7 +159,7 @@ async def send_message(
                 entities=[
                     types.MessageEntity._parse(None, entity, {})
                     for entity in entities
-                ],
+                ] if entities else None,
                 client=self
             )
 
diff --git a/pyrogram/methods/messages/send_poll.py b/pyrogram/methods/messages/send_poll.py
@@ -155,7 +155,7 @@ async def send_poll(
                     ),
                     correct_answers=[bytes([correct_option_id])] if correct_option_id is not None else None,
                     solution=solution,
-                    solution_entities=solution_entities
+                    solution_entities=solution_entities or []
                 ),
                 message="",
                 silent=disable_notification,
diff --git a/pyrogram/parser/html.py b/pyrogram/parser/html.py
@@ -149,7 +149,7 @@ async def parse(self, text: str):
 
         return {
             "message": utils.remove_surrogates(parser.text),
-            "entities": sorted(entities, key=lambda e: e.offset)
+            "entities": sorted(entities, key=lambda e: e.offset) or None
         }
 
     @staticmethod
diff --git a/pyrogram/parser/parser.py b/pyrogram/parser/parser.py
@@ -49,7 +49,7 @@ async def parse(self, text: str, mode: Optional[enums.ParseMode] = None):
             return await self.html.parse(text)
 
         if mode == enums.ParseMode.DISABLED:
-            return {"message": text, "entities": []}
+            return {"message": text, "entities": None}
 
         raise ValueError(f'Invalid parse mode "{mode}"')
 
diff --git a/pyrogram/types/authorization/terms_of_service.py b/pyrogram/types/authorization/terms_of_service.py
@@ -52,5 +52,5 @@ def _parse(terms_of_service: "raw.types.help.TermsOfService") -> "TermsOfService
             entities=[
                 types.MessageEntity._parse(None, entity, {})
                 for entity in terms_of_service.entities
-            ]
+            ] if terms_of_service.entities else None
         )
diff --git a/pyrogram/utils.py b/pyrogram/utils.py
@@ -349,7 +349,7 @@ async def parse_text_entities(
         for entity in entities:
             entity._client = client
 
-        text, entities = text, [await entity.write() for entity in entities]
+        text, entities = text, [await entity.write() for entity in entities] or None
     else:
         text, entities = (await client.parser.parse(text, parse_mode)).values()
 

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ async def send_message(`
`159`	`159`	`entities=[`
`160`	`160`	`types.MessageEntity._parse(None, entity, {})`
`161`	`161`	`for entity in entities`
`162`		`- ],`
	`162`	`+ ] if entities else None,`
`163`	`163`	`client=self`
`164`	`164`	`)`
`165`	`165`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ async def parse(self, text: str):`
`149`	`149`
`150`	`150`	`return {`
`151`	`151`	`"message": utils.remove_surrogates(parser.text),`
`152`		`- "entities": sorted(entities, key=lambda e: e.offset)`
	`152`	`+ "entities": sorted(entities, key=lambda e: e.offset) or None`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`@staticmethod`
Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,5 @@ def _parse(terms_of_service: "raw.types.help.TermsOfService") -> "TermsOfService`
`52`	`52`	`entities=[`
`53`	`53`	`types.MessageEntity._parse(None, entity, {})`
`54`	`54`	`for entity in terms_of_service.entities`
`55`		`- ]`
	`55`	`+ ] if terms_of_service.entities else None`
`56`	`56`	`)`