Follow-Up: 88f9040

Fixes: pyrogram/pyrogram#1009

Thanks: https://t.me/pyrogramchat/247933

Author: SpEcHiDe

compiler/docs/compiler.py

@@ -512,6 +512,7 @@ def get_title_list(s: str) -> list:
             PollOption
             InputPollOption
             Poll
+            PollAnswer
             Location
             Venue
             Gift

pyrogram/dispatcher.py

@@ -77,7 +77,8 @@ class Dispatcher:
     CHAT_MEMBER_UPDATES = (UpdateChatParticipant, UpdateChannelParticipant, UpdateBotStopped,)
     USER_STATUS_UPDATES = (UpdateUserStatus,)
     BOT_INLINE_QUERY_UPDATES = (UpdateBotInlineQuery,)
-    POLL_UPDATES = (UpdateMessagePoll, UpdateMessagePollVote,)
+    POLL_UPDATES = (UpdateMessagePoll,)
+    POLL_ANSWER_UPDATES = (UpdateMessagePollVote,)
     CHOSEN_INLINE_RESULT_UPDATES = (UpdateBotInlineSend,)
     CHAT_JOIN_REQUEST_UPDATES = (UpdateBotChatInviteRequester,)
     MESSAGE_BOT_NA_REACTION_UPDATES = (UpdateBotMessageReaction,)
@@ -152,6 +153,14 @@ async def poll_parser(update, users, chats):
                 ),
                 PollHandler
             )
+        
+        async def poll_answer_parser(update, users, chats):
+            return (
+                pyrogram.types.PollAnswer._parse_update(
+                    self.client, update, users, chats
+                ),
+                PollHandler
+            )
 
         async def chosen_inline_result_parser(update, users, chats):
             return (
@@ -217,6 +226,7 @@ async def story_parser(update, users, chats):
             Dispatcher.USER_STATUS_UPDATES: user_status_parser,
             Dispatcher.BOT_INLINE_QUERY_UPDATES: inline_query_parser,
             Dispatcher.POLL_UPDATES: poll_parser,
+            Dispatcher.POLL_ANSWER_UPDATES: poll_answer_parser,
             Dispatcher.CHOSEN_INLINE_RESULT_UPDATES: chosen_inline_result_parser,
             Dispatcher.CHAT_MEMBER_UPDATES: chat_member_updated_parser,
             Dispatcher.CHAT_JOIN_REQUEST_UPDATES: chat_join_request_parser,

pyrogram/handlers/poll_handler.py

@@ -42,8 +42,9 @@ class PollHandler(Handler):
         client (:obj:`~pyrogram.Client`):
             The Client itself, useful when you want to call other API methods inside the poll handler.
 
-        poll (:obj:`~pyrogram.types.Poll`):
-            The received poll.
+        poll (:obj:`~pyrogram.types.Poll` | :obj:`~pyrogram.types.PollAnswer`):
+            New poll state. Bots receive only updates about manually stopped polls and polls, which are sent by the bot.
+            A user changed their answer in a non-anonymous poll. Bots receive new votes only in polls that were sent by the bot itself.
     """
 
     def __init__(self, callback: Callable, filters=None):

pyrogram/types/messages_and_media/__init__.py

@@ -29,6 +29,7 @@
 from .message_entity import MessageEntity
 from .photo import Photo
 from .poll import Poll
+from .poll_answer import PollAnswer
 from .poll_option import PollOption
 from .reaction import (
     Reaction,
@@ -105,6 +106,7 @@
     "Thumbnail",
     "StrippedThumbnail",
     "Poll",
+    "PollAnswer",
     "PollOption",
     "SponsoredMessage",
     "Gift",

pyrogram/types/messages_and_media/poll.py

@@ -77,12 +77,6 @@ class Poll(Object, Update):
 
         close_date (:py:obj:`~datetime.datetime`, *optional*):
             Point in time when the poll will be automatically closed.
-        
-        user (:obj:`~pyrogram.types.User`, *optional*):
-            The user that changed the answer to the poll, if the voter isn't anonymous.
-        
-        voter_chat (:obj:`~pyrogram.types.Chat`, *optional*):
-            The chat that changed the answer to the poll, if the voter is anonymous.
 
     """
 
@@ -105,8 +99,6 @@ def __init__(
         explanation_entities: Optional[List["types.MessageEntity"]] = None,
         open_period: Optional[int] = None,
         close_date: Optional[datetime] = None,
-        user: Optional["types.User"] = None,
-        voter_chat: Optional["types.Chat"] = None,
     ):
         super().__init__(client)
 
@@ -125,9 +117,6 @@ def __init__(
         self.explanation_entities = explanation_entities
         self.open_period = open_period
         self.close_date = close_date
-        # TODO: spit this out
-        self.user = user
-        self.voter_chat = voter_chat
 
     @staticmethod
     def _parse(client, media_poll: Union["raw.types.MessageMediaPoll", "raw.types.UpdateMessagePoll"]) -> "Poll":
@@ -250,37 +239,6 @@ def _parse_update(
                 client=client
             )
 
-        if isinstance(update, raw.types.UpdateMessagePollVote):
-            user = None
-            voter_chat = None
-            if isinstance(update.peer, raw.types.PeerUser):
-                user = types.Chat._parse_user_chat(client, users[update.peer.user_id])
-
-            elif isinstance(update.peer, raw.types.PeerChat):
-                voter_chat = types.Chat._parse_chat_chat(client, chats[update.peer.chat_id])
-
-            else:
-                voter_chat = types.Chat._parse_channel_chat(client, chats[update.peer.channel_id])
-
-            return Poll(
-                id=str(update.poll_id),
-                question="",
-                options=[
-                    types.PollOption(
-                        text="",
-                        text_entities=[],
-                        voter_count=None,
-                        data=option,
-                        client=client
-                    ) for option in update.options
-                ],
-                total_voter_count=None,
-                is_closed=False,
-                user=user,
-                voter_chat=voter_chat,
-                client=client
-            )
-
     async def stop(
         self,
         reply_markup: "types.InlineKeyboardMarkup" = None,

pyrogram/types/messages_and_media/poll_answer.py

@@ -0,0 +1,90 @@
+#  Pyrogram - Telegram MTProto API Client Library for Python
+#  Copyright (C) 2017-present Dan <https://github.com/delivrance>
+#
+#  This file is part of Pyrogram.
+#
+#  Pyrogram is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Lesser General Public License as published
+#  by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Pyrogram is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
+
+from typing import List, Optional
+
+import pyrogram
+from pyrogram import enums, raw, types, utils
+from ..object import Object
+from ..update import Update
+from .message import Str
+
+
+class PollAnswer(Object, Update):
+    """This object represents an answer of a user in a non-anonymous poll.
+
+    Parameters:
+        poll_id (``str``):
+            Unique poll identifier.
+
+        voter_chat (:obj:`~pyrogram.types.Chat`, *optional*):
+            The chat that changed the answer to the poll, if the voter is anonymous.
+
+        user (:obj:`~pyrogram.types.User`, *optional*):
+            The user that changed the answer to the poll, if the voter isn't anonymous.
+
+        option_ids (List of ``int``):
+            0-based identifiers of chosen answer options. May be empty if the vote was retracted.
+
+    """
+
+    def __init__(
+        self,
+        *,
+        client: "pyrogram.Client" = None,
+        poll_id: str,
+        option_ids: List[int],
+        user: Optional["types.User"] = None,
+        voter_chat: Optional["types.Chat"] = None,
+    ):
+        super().__init__(client)
+
+        self.poll_id = poll_id
+        self.option_ids = option_ids
+        self.user = user
+        self.voter_chat = voter_chat
+
+    @staticmethod
+    def _parse_update(
+        client,
+        update: "raw.types.UpdateMessagePollVote",
+        users: dict,
+        chats: dict,
+    ):
+        if isinstance(update, raw.types.UpdateMessagePollVote):
+            user = None
+            voter_chat = None
+            if isinstance(update.peer, raw.types.PeerUser):
+                user = types.Chat._parse_user_chat(client, users[update.peer.user_id])
+
+            elif isinstance(update.peer, raw.types.PeerChat):
+                voter_chat = types.Chat._parse_chat_chat(client, chats[update.peer.chat_id])
+
+            else:
+                voter_chat = types.Chat._parse_channel_chat(client, chats[update.peer.channel_id])
+
+            return PollAnswer(
+                poll_id=str(update.poll_id),
+                option_ids=[
+                    "{:0>2x}".format(option[0])
+                    for option in update.options
+                ],
+                user=user,
+                voter_chat=voter_chat,
+                client=client
+            )