Merge branch 'master' into feat/ua

Signed-off-by: plun1331 <plun1331@gmail.com>

.github/workflows/todo.yml

@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run tdg-github-action
-        uses: ribtoks/tdg-github-action@v0.4.10-beta
+        uses: ribtoks/tdg-github-action@v0.4.11-beta
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.2
+    rev: v3.16.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]

CHANGELOG.md

@@ -24,6 +24,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2421](https://github.com/Pycord-Development/pycord/pull/2421))
 - Added `member` data to the `raw_reaction_remove` event.
   ([#2412](https://github.com/Pycord-Development/pycord/pull/2412))
+- Added `Poll` and all related features.
+  ([#2408](https://github.com/Pycord-Development/pycord/pull/2408))
 - Added `stacklevel` param to `utils.warn_deprecated` and `utils.deprecated`.
   ([#2450](https://github.com/Pycord-Development/pycord/pull/2450))
 - Added support for user-installable applications.
@@ -56,6 +58,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2458](https://github.com/Pycord-Development/pycord/pull/2458))
 - Fixed many inaccurate type hints throughout the library.
   ([#2457](https://github.com/Pycord-Development/pycord/pull/2457))
+- Fixed `AttributeError` due to `discord.Option` being initialised with `input_type` set
+  to `None`. ([#2464](https://github.com/Pycord-Development/pycord/pull/2464))
 
 ### Changed
 

discord/__init__.py

@@ -58,6 +58,7 @@
 from .partial_emoji import *
 from .permissions import *
 from .player import *
+from .poll import *
 from .raw_models import *
 from .reaction import *
 from .role import *

discord/abc.py

@@ -89,6 +89,7 @@
     from .guild import Guild
     from .member import Member
     from .message import Message, MessageReference, PartialMessage
+    from .poll import Poll
     from .state import ConnectionState
     from .threads import Thread
     from .types.channel import Channel as ChannelPayload
@@ -1351,6 +1352,7 @@ async def send(
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
         view: View = ...,
+        poll: Poll = ...,
         suppress: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
@@ -1371,6 +1373,7 @@ async def send(
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
         view: View = ...,
+        poll: Poll = ...,
         suppress: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
@@ -1391,6 +1394,7 @@ async def send(
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
         view: View = ...,
+        poll: Poll = ...,
         suppress: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
@@ -1411,6 +1415,7 @@ async def send(
         reference: Message | MessageReference | PartialMessage = ...,
         mention_author: bool = ...,
         view: View = ...,
+        poll: Poll = ...,
         suppress: bool = ...,
         silent: bool = ...,
     ) -> Message: ...
@@ -1432,6 +1437,7 @@ async def send(
         reference=None,
         mention_author=None,
         view=None,
+        poll=None,
         suppress=None,
         silent=None,
     ):
@@ -1515,6 +1521,10 @@ async def send(
             Whether to suppress push and desktop notifications for the message.
 
             .. versionadded:: 2.4
+        poll: :class:`Poll`
+            The poll to send.
+
+            .. versionadded:: 2.6
 
         Returns
         -------
@@ -1594,6 +1604,9 @@ async def send(
         else:
             components = None
 
+        if poll:
+            poll = poll.to_dict()
+
         if file is not None and files is not None:
             raise InvalidArgument("cannot pass both file and files parameter to send()")
 
@@ -1616,6 +1629,7 @@ async def send(
                     stickers=stickers,
                     components=components,
                     flags=flags,
+                    poll=poll,
                 )
             finally:
                 file.close()
@@ -1643,6 +1657,7 @@ async def send(
                     stickers=stickers,
                     components=components,
                     flags=flags,
+                    poll=poll,
                 )
             finally:
                 for f in files:
@@ -1661,6 +1676,7 @@ async def send(
                 stickers=stickers,
                 components=components,
                 flags=flags,
+                poll=poll,
             )
 
         ret = state.create_message(channel=channel, data=data)

discord/client.py

@@ -70,6 +70,7 @@
     from .channel import DMChannel
     from .member import Member
     from .message import Message
+    from .poll import Poll
     from .voice_client import VoiceProtocol
 
 __all__ = ("Client",)
@@ -338,6 +339,14 @@ def stickers(self) -> list[GuildSticker]:
         """
         return self._connection.stickers
 
+    @property
+    def polls(self) -> list[Poll]:
+        """The polls that the connected client has.
+
+        .. versionadded:: 2.6
+        """
+        return self._connection.polls
+
     @property
     def cached_messages(self) -> Sequence[Message]:
         """Read-only list of messages the connected client has cached.
@@ -1010,6 +1019,21 @@ def get_sticker(self, id: int, /) -> GuildSticker | None:
         """
         return self._connection.get_sticker(id)
 
+    def get_poll(self, id: int, /) -> Poll | None:
+        """Returns a poll attached to the given message ID.
+
+        Parameters
+        ----------
+        id: :class:`int`
+            The message ID of the poll to search for.
+
+        Returns
+        -------
+        Optional[:class:`.Poll`]
+            The poll or ``None`` if not found.
+        """
+        return self._connection.get_poll(id)
+
     def get_all_channels(self) -> Generator[GuildChannel, None, None]:
         """A generator that retrieves every :class:`.abc.GuildChannel` the client can 'access'.
 

discord/commands/options.py

@@ -330,6 +330,9 @@ def __init__(
             "description_localizations", MISSING
         )
 
+        if input_type is None:
+            raise TypeError("input_type cannot be NoneType.")
+
     def to_dict(self) -> dict:
         as_dict = {
             "name": self.name,

discord/enums.py

@@ -1021,7 +1021,7 @@ class EntitlementOwnerType(Enum):
     guild = 1
     user = 2
 
-
+    
 class IntegrationType(Enum):
     """The application's integration type"""
 
@@ -1036,6 +1036,12 @@ class InteractionContextType(Enum):
     bot_dm = 1
     private_channel = 2
 
+
+class PollLayoutType(Enum):
+    """The poll's layout type."""
+
+    default = 1
+
 
 T = TypeVar("T")
 

discord/flags.py

@@ -885,6 +885,8 @@ def messages(self):
         - :class:`Message`
         - :attr:`Client.cached_messages`
         - :meth:`Client.get_message`
+        - :attr:`Client.polls`
+        - :meth:`Client.get_poll`
 
         Note that due to an implicit relationship this also corresponds to the following events:
 
@@ -917,6 +919,8 @@ def guild_messages(self):
         - :class:`Message`
         - :attr:`Client.cached_messages` (only for guilds)
         - :meth:`Client.get_message` (only for guilds)
+        - :attr:`Client.polls` (only for guilds)
+        - :meth:`Client.get_poll` (only for guilds)
 
         Note that due to an implicit relationship this also corresponds to the following events:
 
@@ -931,6 +935,7 @@ def guild_messages(self):
         - :attr:`Message.embeds`
         - :attr:`Message.attachments`
         - :attr:`Message.components`
+        - :attr:`Message.poll`
 
         For more information go to the :ref:`message content intent documentation <need_message_content_intent>`.
         """
@@ -955,6 +960,8 @@ def dm_messages(self):
         - :class:`Message`
         - :attr:`Client.cached_messages` (only for DMs)
         - :meth:`Client.get_message` (only for DMs)
+        - :attr:`Client.polls` (only for DMs)
+        - :meth:`Client.get_poll` (only for DMs)
 
         Note that due to an implicit relationship this also corresponds to the following events:
 
@@ -1079,6 +1086,7 @@ def message_content(self):
         - :attr:`Message.embeds`
         - :attr:`Message.attachments`
         - :attr:`Message.components`
+        - :attr:`Message.poll`
 
         These attributes will still be available for messages received from interactions,
         the bot's own messages, messages the bot was mentioned in, and DMs.
@@ -1137,6 +1145,66 @@ def auto_moderation_execution(self):
         """
         return 1 << 21
 
+    @flag_value
+    def guild_polls(self):
+        """:class:`bool`: Whether poll-related events in guilds are enabled.
+
+        See also :attr:`dm_polls` for DMs or :attr:`polls` for both.
+
+        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)
+
+        This also corresponds to the following attributes and classes in terms of cache:
+
+        - :attr:`PollAnswer.count` (only for guild polls)
+        - :attr:`PollResults.answer_counts` (only for guild polls)
+        """
+        return 1 << 24
+
+    @flag_value
+    def dm_polls(self):
+        """:class:`bool`: Whether poll-related events in direct messages are enabled.
+
+        See also :attr:`guild_polls` for guilds or :attr:`polls` for both.
+
+        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)
+
+        This also corresponds to the following attributes and classes in terms of cache:
+
+        - :attr:`PollAnswer.count` (only for DM polls)
+        - :attr:`PollResults.answer_counts` (only for DM polls)
+        """
+        return 1 << 25
+
+    @alias_flag_value
+    def polls(self):
+        """:class:`bool`: Whether poll-related events in guilds and direct messages 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)
+
+        This also corresponds to the following attributes and classes in terms of cache:
+
+        - :attr:`PollAnswer.count` (both guild and DM polls)
+        - :attr:`PollResults.answer_counts` (both guild and DM polls)
+        """
+        return (1 << 24) | (1 << 25)
+
 
 @fill_with_flags()
 class MemberCacheFlags(BaseFlags):