feat: Add media to Poll and PollOption class

Author: KurimuzonAkuma

compiler/docs/compiler.py

@@ -738,6 +738,7 @@ def get_title_list(s: str) -> list:
             ManagedBotCreated
             MaskPosition
             MediaArea
+            MessageContent
             Venue
             Sticker
             Game

pyrogram/dispatcher.py

@@ -172,7 +172,7 @@ async def inline_query_parser(update, users, chats):
 
         async def poll_parser(update, users, chats):
             return (
-                pyrogram.types.Poll._parse_update(self.client, update, users, chats),
+                await pyrogram.types.Poll._parse_update(self.client, update, users, chats),
                 PollHandler
             )
 

pyrogram/methods/messages/retract_vote.py

@@ -61,4 +61,4 @@ async def retract_vote(
         users = {i.id: i for i in r.users}
         chats = {i.id: i for i in r.chats}
 
-        return types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)
+        return await types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)

pyrogram/methods/messages/send_poll.py

@@ -31,7 +31,7 @@ async def send_poll(
         chat_id: Union[int, str],
         question: Union[str, "types.FormattedText"],
         options: List[Union[str, "types.InputPollOption"]],
-        media: Optional["types.InputMedia"] = None,
+        description_media: Optional["types.InputMedia"] = None,
         message_thread_id: Optional[int] = None,
         business_connection_id: Optional[str] = None,
         is_anonymous: bool = True,
@@ -43,6 +43,7 @@ async def send_poll(
         hide_results_until_closes: Optional[bool] = None,
         correct_option_ids: Optional[List[int]] = None,
         explanation: Optional[Union[str, "types.FormattedText"]] = None,
+        explanation_media: Optional["types.InputMedia"] = None,
         open_period: Optional[int] = None,
         close_date: Optional[datetime] = None,
         is_closed: Optional[bool] = None,
@@ -86,9 +87,8 @@ async def send_poll(
             options (List of :obj:`~pyrogram.types.InputPollOption`):
                 List of 2-12 answer options.
 
-            media (:obj:`~pyrogram.types.InputMediaPhoto` | :obj:`~pyrogram.types.InputMediaVideo` | :obj:`~pyrogram.types.InputMediaSticker` | :obj:`~pyrogram.types.Location`, *optional*):
+            explanation_media (:obj:`~pyrogram.types.InputMedia` | :obj:`~pyrogram.types.Location`, *optional*):
                 Media attached to the poll.
-                Currently supports only photo, video, sticker or location.
 
             message_thread_id (``int``, *optional*):
                 Unique identifier for the target message thread (topic) of the forum.
@@ -128,6 +128,9 @@ async def send_poll(
             explanation (``str`` | :obj:`~pyrogram.types.FormattedText`, *optional*):
                 Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line feeds after entities parsing.
 
+            explanation_media (:obj:`~pyrogram.types.InputMedia` | :obj:`~pyrogram.types.Location`, *optional*):
+                Media attached to the explanation.
+
             open_period (``int``, *optional*):
                 Amount of time in seconds the poll will be active after creation, 5-2628000.
                 Can't be used together with *close_date*.
@@ -199,7 +202,7 @@ async def send_poll(
                 await app.send_poll(
                     chat_id=chat_id,
                     question="Where we are?",
-                    media=types.InputMediaPhoto("photo.jpg"),
+                    description_media=types.InputMediaPhoto("photo.jpg"),
                     options=[
                         types.InputPollOption(
                             text="Maybe here?",
@@ -208,24 +211,13 @@ async def send_poll(
                         types.InputPollOption(
                             text="Or here?",
                             media=types.Location(
-                                longitude=49.807760,
-                                latitude=73.088504
+                                latitude=49.807760,
+                                longitude=73.088504
                             ),
                         ),
                     ]
                 )
         """
-        if media is not None and not isinstance(
-            media,
-            (
-                types.InputMediaPhoto,
-                types.InputMediaVideo,
-                types.InputMediaSticker,
-                types.Location,
-            ),
-        ):
-            raise ValueError("Unsupported media type")
-
         if isinstance(question, str):
             question = types.FormattedText(text=question)
 
@@ -283,9 +275,10 @@ async def send_poll(
                         close_date=utils.datetime_to_timestamp(close_date)
                     ),
                     correct_answers=correct_option_ids,
-                    attached_media=await media.write(client=self) if media is not None else None,
+                    attached_media=await description_media.write(client=self) if description_media is not None else None,
                     solution=solution,
-                    solution_entities=solution_entities
+                    solution_entities=solution_entities,
+                    solution_media=await explanation_media.write(client=self) if explanation_media is not None else None
                 ),
                 message=message or "",
                 entities=entities or None,

pyrogram/methods/messages/stop_poll.py

@@ -78,4 +78,4 @@ async def stop_poll(
         users = {i.id: i for i in r.users}
         chats = {i.id: i for i in r.chats}
 
-        return types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)
+        return await types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)

pyrogram/methods/messages/vote_poll.py

@@ -68,4 +68,4 @@ async def vote_poll(
         users = {i.id: i for i in r.users}
         chats = {i.id: i for i in r.chats}
 
-        return types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)
+        return await types.Poll._parse(self, r.updates[0], None, users=users, chats=chats)

pyrogram/types/input_content/input_poll_option.py

@@ -31,9 +31,9 @@ class InputPollOption(Object):
         text (``str`` | :obj:`~pyrogram.enums.FormattedText`, *optional*):
             Option text, 1-100 characters.
 
-        media (:obj:`~pyrogram.types.InputMediaPhoto` | :obj:`~pyrogram.types.InputMediaVideo` | :obj:`~pyrogram.types.InputMediaSticker` | :obj:`~pyrogram.types.Location`, *optional*):
-            Media associated with the option.
-            Currently supports only photo, video, sticker or location.
+        media (:obj:`~pyrogram.types.InputMedia` | :obj:`~pyrogram.types.Location`, *optional*):
+            Option media.
+            Currently, can be only of the types Animation, Location, Photo, Sticker, Venue, or Video without caption.
     """
 
     def __init__(
@@ -42,9 +42,7 @@ def __init__(
         text: Union[str, "types.FormattedText"],
         media: Optional[
             Union[
-                "types.InputMediaPhoto",
-                "types.InputMediaVideo",
-                "types.InputMediaSticker",
+                "types.InputMedia",
                 "types.Location",
             ]
         ] = None,
@@ -58,17 +56,6 @@ async def write(self, client: "pyrogram.Client") -> "raw.types.InputPollAnswer":
         if isinstance(self.text, str):
             self.text = types.FormattedText(text=self.text)
 
-        if self.media is not None and not isinstance(
-            self.media,
-            (
-                types.InputMediaPhoto,
-                types.InputMediaVideo,
-                types.InputMediaSticker,
-                types.Location,
-            ),
-        ):
-            raise ValueError(f"Unsupported media type: {type(self.media)}")
-
         return raw.types.InputPollAnswer(
             text=await self.text.write(client),
             media=await self.media.write(client=client) if self.media is not None else None,

pyrogram/types/messages_and_media/__init__.py

@@ -74,6 +74,7 @@
 from .managed_bot_created import ManagedBotCreated
 from .mask_position import MaskPosition
 from .media_area import MediaArea
+from .message_content import MessageContent
 from .message import Message
 from .message_entity import MessageEntity
 from .message_origin import MessageOrigin
@@ -208,6 +209,7 @@
     "ManagedBotCreated",
     "MaskPosition",
     "MediaArea",
+    "MessageContent",
     "Message",
     "MessageEntity",
     "MessageOrigin",

pyrogram/types/messages_and_media/external_reply_info.py

@@ -282,7 +282,7 @@ async def _parse(
                         document = types.Document._parse(client, doc, file_name)
                         media_type = enums.MessageMediaType.DOCUMENT
             elif isinstance(media, raw.types.MessageMediaPoll):
-                poll = types.Poll._parse(client, media, None, users=users, chats=chats)
+                poll = await types.Poll._parse(client, media, None, users=users, chats=chats)
                 media_type = enums.MessageMediaType.POLL
             elif isinstance(media, raw.types.MessageMediaDice):
                 dice = types.Dice._parse(client, media)

pyrogram/types/messages_and_media/message.py

@@ -590,6 +590,7 @@ class Message(Object, Update):
             IETF language tag of the message language on which it can be summarized.
             None if summary isn't available for the message.
     """
+    # TODO: replace media params to MessageContent class
     def __init__(
         self,
         *,
@@ -1572,7 +1573,7 @@ async def _parse_message(
                 media_type = enums.MessageMediaType.WEB_PAGE
                 web_page = types.WebPage._parse(client, media)
             elif isinstance(media, raw.types.MessageMediaPoll):
-                poll = types.Poll._parse(
+                poll = await types.Poll._parse(
                     client,
                     media,
                     description=types.FormattedText._parse(