Add support for components V2

Co-authored-by: Michael H <[email protected]>
Co-authored-by: Soheab <[email protected]>
Co-authored-by: owocado <[email protected]>
Co-authored-by: Jay3332 <[email protected]>
Co-authored-by: Danny <[email protected]>

Author: 6 people

discord/abc.py

@@ -96,7 +96,7 @@
     )
     from .poll import Poll
     from .threads import Thread
-    from .ui.view import View
+    from .ui.view import BaseView, View, LayoutView
     from .types.channel import (
         PermissionOverwrite as PermissionOverwritePayload,
         Channel as ChannelPayload,
@@ -1386,6 +1386,38 @@ class Messageable:
     async def _get_channel(self) -> MessageableChannel:
         raise NotImplementedError
 
+    @overload
+    async def send(
+        self,
+        *,
+        file: File = ...,
+        delete_after: float = ...,
+        nonce: Union[str, int] = ...,
+        allowed_mentions: AllowedMentions = ...,
+        reference: Union[Message, MessageReference, PartialMessage] = ...,
+        mention_author: bool = ...,
+        view: LayoutView,
+        suppress_embeds: bool = ...,
+        silent: bool = ...,
+    ) -> Message:
+        ...
+
+    @overload
+    async def send(
+        self,
+        *,
+        files: Sequence[File] = ...,
+        delete_after: float = ...,
+        nonce: Union[str, int] = ...,
+        allowed_mentions: AllowedMentions = ...,
+        reference: Union[Message, MessageReference, PartialMessage] = ...,
+        mention_author: bool = ...,
+        view: LayoutView,
+        suppress_embeds: bool = ...,
+        silent: bool = ...,
+    ) -> Message:
+        ...
+
     @overload
     async def send(
         self,
@@ -1485,7 +1517,7 @@ async def send(
         allowed_mentions: Optional[AllowedMentions] = None,
         reference: Optional[Union[Message, MessageReference, PartialMessage]] = None,
         mention_author: Optional[bool] = None,
-        view: Optional[View] = None,
+        view: Optional[BaseView] = None,
         suppress_embeds: bool = False,
         silent: bool = False,
         poll: Optional[Poll] = None,
@@ -1558,7 +1590,7 @@ async def send(
             If set, overrides the :attr:`~discord.AllowedMentions.replied_user` attribute of ``allowed_mentions``.
 
             .. versionadded:: 1.6
-        view: :class:`discord.ui.View`
+        view: Union[:class:`discord.ui.View`, :class:`discord.ui.LayoutView`]
             A Discord UI View to add to the message.
 
             .. versionadded:: 2.0
@@ -1656,7 +1688,7 @@ async def send(
             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():
+        if view and not view.is_finished() and view.is_dispatchable():
             state.store_view(view, ret.id)
 
         if poll:

discord/channel.py

@@ -100,7 +100,7 @@
     from .file import File
     from .user import ClientUser, User, BaseUser
     from .guild import Guild, GuildChannel as GuildChannelType
-    from .ui.view import View
+    from .ui.view import BaseView, View, LayoutView
     from .types.channel import (
         TextChannel as TextChannelPayload,
         NewsChannel as NewsChannelPayload,
@@ -2841,6 +2841,47 @@ async def create_tag(
 
         return result
 
+    @overload
+    async def create_thread(
+        self,
+        *,
+        name: str,
+        auto_archive_duration: ThreadArchiveDuration = ...,
+        slowmode_delay: Optional[int] = ...,
+        file: File = ...,
+        files: Sequence[File] = ...,
+        allowed_mentions: AllowedMentions = ...,
+        mention_author: bool = ...,
+        applied_tags: Sequence[ForumTag] = ...,
+        view: LayoutView,
+        suppress_embeds: bool = ...,
+        reason: Optional[str] = ...,
+    ) -> ThreadWithMessage:
+        ...
+
+    @overload
+    async def create_thread(
+        self,
+        *,
+        name: str,
+        auto_archive_duration: ThreadArchiveDuration = ...,
+        slowmode_delay: Optional[int] = ...,
+        content: Optional[str] = ...,
+        tts: bool = ...,
+        embed: Embed = ...,
+        embeds: Sequence[Embed] = ...,
+        file: File = ...,
+        files: Sequence[File] = ...,
+        stickers: Sequence[Union[GuildSticker, StickerItem]] = ...,
+        allowed_mentions: AllowedMentions = ...,
+        mention_author: bool = ...,
+        applied_tags: Sequence[ForumTag] = ...,
+        view: View = ...,
+        suppress_embeds: bool = ...,
+        reason: Optional[str] = ...,
+    ) -> ThreadWithMessage:
+        ...
+
     async def create_thread(
         self,
         *,
@@ -2857,7 +2898,7 @@ async def create_thread(
         allowed_mentions: AllowedMentions = MISSING,
         mention_author: bool = MISSING,
         applied_tags: Sequence[ForumTag] = MISSING,
-        view: View = MISSING,
+        view: BaseView = MISSING,
         suppress_embeds: bool = False,
         reason: Optional[str] = None,
     ) -> ThreadWithMessage:
@@ -2907,7 +2948,7 @@ async def create_thread(
             If set, overrides the :attr:`~discord.AllowedMentions.replied_user` attribute of ``allowed_mentions``.
         applied_tags: List[:class:`discord.ForumTag`]
             A list of tags to apply to the thread.
-        view: :class:`discord.ui.View`
+        view: Union[:class:`discord.ui.View`, :class:`discord.ui.LayoutView`]
             A Discord UI View to add to the message.
         stickers: Sequence[Union[:class:`~discord.GuildSticker`, :class:`~discord.StickerItem`]]
             A list of stickers to upload. Must be a maximum of 3.
@@ -2983,7 +3024,7 @@ async def create_thread(
             data = await state.http.start_thread_in_forum(self.id, params=params, reason=reason)
             thread = Thread(guild=self.guild, state=self._state, data=data)
             message = Message(state=self._state, channel=thread, data=data['message'])
-            if view and not view.is_finished():
+            if view and not view.is_finished() and view.is_dispatchable():
                 self._state.store_view(view, message.id)
 
             return ThreadWithMessage(thread=thread, message=message)

discord/client.py

@@ -72,7 +72,7 @@
 from .backoff import ExponentialBackoff
 from .webhook import Webhook
 from .appinfo import AppInfo
-from .ui.view import View
+from .ui.view import BaseView
 from .ui.dynamic import DynamicItem
 from .stage_instance import StageInstance
 from .threads import Thread
@@ -3156,7 +3156,7 @@ def remove_dynamic_items(self, *items: Type[DynamicItem[Item[Any]]]) -> None:
 
         self._connection.remove_dynamic_items(*items)
 
-    def add_view(self, view: View, *, message_id: Optional[int] = None) -> None:
+    def add_view(self, view: BaseView, *, message_id: Optional[int] = None) -> None:
         """Registers a :class:`~discord.ui.View` for persistent listening.
 
         This method should be used for when a view is comprised of components
@@ -3166,7 +3166,7 @@ def add_view(self, view: View, *, message_id: Optional[int] = None) -> None:
 
         Parameters
         ------------
-        view: :class:`discord.ui.View`
+        view: Union[:class:`discord.ui.View`, :class:`discord.ui.LayoutView`]
             The view to register for dispatching.
         message_id: Optional[:class:`int`]
             The message ID that the view is attached to. This is currently used to
@@ -3182,7 +3182,7 @@ def add_view(self, view: View, *, message_id: Optional[int] = None) -> None:
             and all their components have an explicitly provided custom_id.
         """
 
-        if not isinstance(view, View):
+        if not isinstance(view, BaseView):
             raise TypeError(f'expected an instance of View not {view.__class__.__name__}')
 
         if not view.is_persistent():
@@ -3194,8 +3194,8 @@ def add_view(self, view: View, *, message_id: Optional[int] = None) -> None:
         self._connection.store_view(view, message_id)
 
     @property
-    def persistent_views(self) -> Sequence[View]:
-        """Sequence[:class:`.View`]: A sequence of persistent views added to the client.
+    def persistent_views(self) -> Sequence[BaseView]:
+        """Sequence[Union[:class:`.View`, :class:`.LayoutView`]]: A sequence of persistent views added to the client.
 
         .. versionadded:: 2.0
         """