Add support for Polls

discord/__init__.py

@@ -69,6 +69,7 @@
 from .components import *
 from .threads import *
 from .automod import *
+from .poll import *
 
 
 class VersionInfo(NamedTuple):

discord/abc.py

@@ -92,6 +92,7 @@
         VoiceChannel,
         StageChannel,
     )
+    from .poll import Poll
     from .threads import Thread
     from .ui.view import View
     from .types.channel import (
@@ -1333,6 +1334,15 @@ class Messageable:
     async def _get_channel(self) -> MessageableChannel:
         raise NotImplementedError
 
+    @overload
+    async def send(
+        self,
+        *,
+        poll: Poll,
+        reference: Union[Message, MessageReference, PartialMessage] = ...,
+    ) -> Message:
+        ...
+
     @overload
     async def send(
         self,
@@ -1431,6 +1441,7 @@ async def send(
         view: Optional[View] = None,
         suppress_embeds: bool = False,
         silent: bool = False,
+        poll: Poll = MISSING,
     ) -> Message:
         """|coro|
 
@@ -1516,6 +1527,10 @@ async def send(
             in the UI, but will not actually send a notification.
 
             .. versionadded:: 2.2
+        poll: :class:`~discord.Poll`
+            The attached poll for this message.
+
+            .. versionadded:: 2.4
 
         Raises
         --------
@@ -1582,13 +1597,17 @@ async def send(
             stickers=sticker_ids,
             view=view,
             flags=flags,
+            poll=poll
         ) as params:
             data = await state.http.send_message(channel.id, params=params)
 
         ret = state.create_message(channel=channel, data=data)
         if view and not view.is_finished():
             state.store_view(view, ret.id)
 
+        if poll is not MISSING:
+            poll._update(ret)
+
         if delete_after is not None:
             await ret.delete(delay=delete_after)
         return ret

discord/client.py

@@ -107,6 +107,7 @@
         RawThreadMembersUpdate,
         RawThreadUpdateEvent,
         RawTypingEvent,
+        RawPollVoteActionEvent,
     )
     from .reaction import Reaction
     from .role import Role
@@ -116,6 +117,7 @@
     from .ui.item import Item
     from .voice_client import VoiceProtocol
     from .audit_logs import AuditLogEntry
+    from .poll import PollAnswer
 
 
 # fmt: off
@@ -1834,6 +1836,28 @@ async def wait_for(
     ) -> Tuple[Context[Any], CommandError]:
         ...
 
+    @overload
+    async def wait_for(
+        self: Union[Bot, AutoShardedBot],
+        event: Literal['poll_vote_add', 'poll_vote_remove'],
+        /,
+        *,
+        check: Optional[Callable[[Context[Any]], bool]] = None,
+        timeout: Optional[float] = None,
+    ) -> Tuple[Union[User, Member], Message, PollAnswer]:
+        ...
+
+    @overload
+    async def wait_for(
+        self: Union[Bot, AutoShardedBot],
+        event: Literal['raw_poll_vote_add', 'raw_poll_vote_remove'],
+        /,
+        *,
+        check: Optional[Callable[[Context[Any]], bool]] = None,
+        timeout: Optional[float] = None,
+    ) -> RawPollVoteActionEvent:
+        ...
+
     @overload
     async def wait_for(
         self,

discord/enums.py

@@ -73,6 +73,7 @@
     'SKUType',
     'EntitlementType',
     'EntitlementOwnerType',
+    'PollLayoutType',
 )
 
 
@@ -809,6 +810,10 @@ class EntitlementOwnerType(Enum):
     user = 2
 
 
+class PollLayoutType(Enum):
+    default = 1
+
+
 def create_unknown_value(cls: Type[E], val: Any) -> E:
     value_cls = cls._enum_value_cls_  # type: ignore # This is narrowed below
     name = f'unknown_{val}'

discord/ext/commands/context.py

@@ -50,6 +50,7 @@
     from discord.message import MessageReference, PartialMessage
     from discord.ui import View
     from discord.types.interactions import ApplicationCommandInteractionData
+    from discord.poll import Poll
 
     from .cog import Cog
     from .core import Command
@@ -623,6 +624,14 @@ async def send_help(self, *args: Any) -> Any:
         except CommandError as e:
             await cmd.on_help_command_error(self, e)
 
+    @overload
+    async def reply(
+        self,
+        *,
+        poll: Poll
+    ) -> Message:
+        ...
+
     @overload
     async def reply(
         self,
@@ -808,6 +817,15 @@ async def defer(self, *, ephemeral: bool = False) -> None:
         if self.interaction:
             await self.interaction.response.defer(ephemeral=ephemeral)
 
+    @overload
+    async def send(
+        self,
+        *,
+        poll: Poll,
+        reference: Union[Message, MessageReference, PartialMessage] = ...,
+    ) -> Message:
+        ...
+
     @overload
     async def send(
         self,
@@ -911,6 +929,7 @@ async def send(
         suppress_embeds: bool = False,
         ephemeral: bool = False,
         silent: bool = False,
+        poll: Poll = MISSING
     ) -> Message:
         """|coro|
 
@@ -1000,6 +1019,11 @@ async def send(
 
             .. versionadded:: 2.2
 
+        poll: :class:`~discord.Poll`
+            The attached poll for this message.
+
+            .. versionadded:: 2.4
+
         Raises
         --------
         ~discord.HTTPException
@@ -1037,6 +1061,7 @@ async def send(
                 view=view,
                 suppress_embeds=suppress_embeds,
                 silent=silent,
+                poll=poll
             )  # type: ignore # The overloads don't support Optional but the implementation does
 
         # Convert the kwargs from None to MISSING to appease the remaining implementations
@@ -1052,6 +1077,7 @@ async def send(
             'suppress_embeds': suppress_embeds,
             'ephemeral': ephemeral,
             'silent': silent,
+            'poll': poll
         }
 
         if self.interaction.response.is_done():
@@ -1061,5 +1087,5 @@ async def send(
             msg = await self.interaction.original_response()
 
         if delete_after is not None:
-            await msg.delete(delay=delete_after)
-        return msg
+            await msg.delete(delay=delete_after) # type: ignore
+        return msg # type: ignore

discord/flags.py

@@ -1255,6 +1255,57 @@ def auto_moderation_execution(self):
         """
         return 1 << 21
 
+    @flag_value
+    def polls(self):
+        """:class:`bool`: Whether guild and direct messages poll related events are enabled.
+
+        This is a shortcut to set or get both :attr:`guild_polls` and :attr:`dm_polls`.
+
+        This corresponds to the following events:
+
+        - :func:`on_poll_vote_add` (both guilds and DMs)
+        - :func:`on_poll_vote_remove` (both guilds and DMs)
+        - :func:`on_raw_poll_vote_add` (both guilds and DMs)
+        - :func:`on_raw_poll_vote_remove` (both guilds and DMs)
+
+        .. versionadded:: 2.4
+        """
+        return (1 << 24) | (1 << 25)
+
+    @flag_value
+    def guild_polls(self):
+        """:class:`bool`: Whether guild poll related events are enabled.
+
+        See also :attr:`dm_polls` and :attr:`polls`.
+
+        This corresponds to the following events:
+
+        - :func:`on_poll_vote_add` (only for guilds)
+        - :func:`on_poll_vote_remove` (only for guilds)
+        - :func:`on_raw_poll_vote_add` (only for guilds)
+        - :func:`on_raw_poll_vote_remove` (only for guilds)
+
+        .. versionadded:: 2.4
+        """
+        return 1 << 24
+
+    @flag_value
+    def dm_polls(self):
+        """:class:`bool`: Whether direct messages poll related events are enabled.
+
+        See also :attr:`guild_polls` and :attr:`polls`.
+
+        This corresponds to the following events:
+
+        - :func:`on_poll_vote_add` (only for DMs)
+        - :func:`on_poll_vote_remove` (only for DMs)
+        - :func:`on_raw_poll_vote_add` (only for DMs)
+        - :func:`on_raw_poll_vote_remove` (only for DMs)
+
+        .. versionadded:: 2.4
+        """
+        return 1 << 25
+
 
 @fill_with_flags()
 class MemberCacheFlags(BaseFlags):

discord/http.py

@@ -68,6 +68,7 @@
     from .embeds import Embed
     from .message import Attachment
     from .flags import MessageFlags
+    from .poll import Poll
 
     from .types import (
         appinfo,
@@ -91,6 +92,7 @@
         sticker,
         welcome_screen,
         sku,
+        poll
     )
     from .types.snowflake import Snowflake, SnowflakeList
 
@@ -154,6 +156,7 @@ def handle_message_parameters(
     thread_name: str = MISSING,
     channel_payload: Dict[str, Any] = MISSING,
     applied_tags: Optional[SnowflakeList] = MISSING,
+    poll: Poll = MISSING
 ) -> MultipartParameters:
     if files is not MISSING and file is not MISSING:
         raise TypeError('Cannot mix file and files keyword arguments.')
@@ -256,6 +259,13 @@ def handle_message_parameters(
         }
         payload.update(channel_payload)
 
+    if poll is not MISSING:
+        if len(poll) == 0 or len(poll) > 10:
+            raise ValueError('Poll must contain between 1 and 10 answers')
+        if poll._hours_duration < 1 or poll._hours_duration > 168:
+            raise ValueError('Polls duration must be between 1 hour and 7 days')
+        payload['poll'] = poll._to_dict() # type: ignore
+
     multipart = []
     if files:
         multipart.append({'name': 'payload_json', 'value': utils._to_json(payload)})
@@ -2502,6 +2512,43 @@ def edit_application_info(self, *, reason: Optional[str], payload: Any) -> Respo
 
         payload = {k: v for k, v in payload.items() if k in valid_keys}
         return self.request(Route('PATCH', '/applications/@me'), json=payload, reason=reason)
+
+    def get_poll_answer_voters(
+        self,
+        channel_id: Snowflake,
+        message_id: Snowflake,
+        answer_id: Snowflake,
+        after: Optional[Snowflake] = None,
+        limit: Optional[int] = None,
+    ) -> Response[poll.PollAnswerVoters]:
+        params = {}
+
+        if after:
+            params['after'] = int(after)
+
+        if limit:
+            params['limit'] = limit
+
+        return self.request(
+            Route(
+                'GET',
+                '/channels/{channel_id}/polls/{message_id}/answers/{answer_id}',
+                channel_id=channel_id,
+                message_id=message_id,
+                answer_id=answer_id,
+            ),
+            params=params
+        )
+
+    def end_poll(self, channel_id: Snowflake, message_id: Snowflake) -> Response[message.Message]:
+        return self.request(
+            Route(
+                'POST',
+                '/channels/{channel_id}/polls/{message_id}/expire',
+                channel_id=channel_id,
+                message_id=message_id
+            )
+        )
 
     async def get_gateway(self, *, encoding: str = 'json', zlib: bool = True) -> str:
         try:

discord/interactions.py

@@ -76,6 +76,7 @@
     from .channel import VoiceChannel, StageChannel, TextChannel, ForumChannel, CategoryChannel, DMChannel, GroupChannel
     from .threads import Thread
     from .app_commands.commands import Command, ContextMenu
+    from .poll import Poll
 
     InteractionChannel = Union[
         VoiceChannel,
@@ -727,6 +728,7 @@ async def send_message(
         suppress_embeds: bool = False,
         silent: bool = False,
         delete_after: Optional[float] = None,
+        poll: Poll = MISSING,
     ) -> None:
         """|coro|
 
@@ -807,6 +809,7 @@ async def send_message(
             allowed_mentions=allowed_mentions,
             flags=flags,
             view=view,
+            poll=poll
         )
 
         http = parent._state.http