guys don't you love typing changes

Author: NeloBlivion

discord/client.py

@@ -74,7 +74,8 @@
     from .message import Message
     from .poll import Poll
     from .soundboard import SoundboardSound
-    from .ui.item import Item
+    from .ui.item import Item, ViewItem
+    from .ui.modal import BaseModal
     from .voice_client import VoiceProtocol
 
 __all__ = ("Client",)
@@ -546,7 +547,7 @@ async def on_error(self, event_method: str, *args: Any, **kwargs: Any) -> None:
         traceback.print_exc()
 
     async def on_view_error(
-        self, error: Exception, item: Item, interaction: Interaction
+        self, error: Exception, item: ViewItem, interaction: Interaction
     ) -> None:
         """|coro|
 
@@ -558,7 +559,7 @@ async def on_view_error(
         ----------
         error: :class:`Exception`
             The exception that was raised.
-        item: :class:`Item`
+        item: :class:`ViewItem`
             The item that the user interacted with.
         interaction: :class:`Interaction`
             The interaction that was received.
@@ -572,7 +573,7 @@ async def on_view_error(
             error.__class__, error, error.__traceback__, file=sys.stderr
         )
 
-    async def on_modal_error(self, error: Exception, interaction: Interaction) -> None:
+    async def on_modal_error(self, error: Exception, modal: BaseModal, interaction: Interaction) -> None:
         """|coro|
 
         The default modal error handler provided by the client.
@@ -584,11 +585,13 @@ async def on_modal_error(self, error: Exception, interaction: Interaction) -> No
         ----------
         error: :class:`Exception`
             The exception that was raised.
+        modal: :class:`BaseModal`
+            The modal that failed the dispatch.
         interaction: :class:`Interaction`
             The interaction that was received.
         """
 
-        print(f"Ignoring exception in modal {interaction.modal}:", file=sys.stderr)
+        print(f"Ignoring exception in modal {modal}:", file=sys.stderr)
         traceback.print_exception(
             error.__class__, error, error.__traceback__, file=sys.stderr
         )

discord/ui/button.py

@@ -32,7 +32,7 @@
 from ..components import Button as ButtonComponent
 from ..enums import ButtonStyle, ComponentType
 from ..partial_emoji import PartialEmoji, _EmojiTag
-from .item import Item, ItemCallbackType
+from .item import ViewItem, ItemCallbackType
 
 __all__ = (
     "Button",
@@ -47,7 +47,7 @@
 V = TypeVar("V", bound="BaseView", covariant=True)
 
 
-class Button(Item[V]):
+class Button(ViewItem[V]):
     """Represents a UI button.
 
     .. versionadded:: 2.0

discord/ui/container.py

@@ -11,7 +11,7 @@
 from .action_row import ActionRow
 from .button import Button
 from .file import File
-from .item import Item, ItemCallbackType
+from .item import ViewItem, ItemCallbackType
 from .media_gallery import MediaGallery
 from .section import Section
 from .select import Select
@@ -32,7 +32,7 @@
 V = TypeVar("V", bound="DesignerView", covariant=True)
 
 
-class Container(Item[V]):
+class Container(ViewItem[V]):
     """Represents a UI Container.
 
     The current items supported are as follows:
@@ -48,7 +48,7 @@ class Container(Item[V]):
 
     Parameters
     ----------
-    *items: :class:`Item`
+    *items: :class:`ViewItem`
         The initial items in this container.
     colour: Union[:class:`Colour`, :class:`int`]
         The accent colour of the container. Aliased to ``color`` as well.
@@ -75,15 +75,15 @@ def __init_subclass__(cls) -> None:
 
     def __init__(
         self,
-        *items: Item,
+        *items: ViewItem,
         colour: int | Colour | None = None,
         color: int | Colour | None = None,
         spoiler: bool = False,
         id: int | None = None,
     ):
         super().__init__()
 
-        self.items: list[Item] = []
+        self.items: list[ViewItem] = []
 
         self._underlying = ContainerComponent._raw_construct(
             type=ComponentType.container,
@@ -96,30 +96,30 @@ def __init__(
         for i in items:
             self.add_item(i)
 
-    def _add_component_from_item(self, item: Item):
+    def _add_component_from_item(self, item: ViewItem):
         self._underlying.components.append(item._underlying)
 
-    def _set_components(self, items: list[Item]):
+    def _set_components(self, items: list[ViewItem]):
         self._underlying.components.clear()
         for item in items:
             self._add_component_from_item(item)
 
-    def add_item(self, item: Item) -> Self:
+    def add_item(self, item: ViewItem) -> Self:
         """Adds an item to the container.
 
         Parameters
         ----------
-        item: :class:`Item`
+        item: :class:`ViewItem`
             The item to add to the container.
 
         Raises
         ------
         TypeError
-            An :class:`Item` was not passed.
+            A :class:`ViewItem` was not passed.
         """
 
-        if not isinstance(item, Item):
-            raise TypeError(f"expected Item not {item.__class__!r}")
+        if not isinstance(item, ViewItem):
+            raise TypeError(f"expected ViewItem not {item.__class__!r}")
 
         if isinstance(item, (Button, Select)):
             raise TypeError(
@@ -135,12 +135,12 @@ def add_item(self, item: Item) -> Self:
         self._add_component_from_item(item)
         return self
 
-    def remove_item(self, item: Item | str | int) -> Self:
+    def remove_item(self, item: ViewItem | str | int) -> Self:
         """Removes an item from the container. If an int or str is passed, it will remove by Item :attr:`id` or ``custom_id`` respectively.
 
         Parameters
         ----------
-        item: Union[:class:`Item`, :class:`int`, :class:`str`]
+        item: Union[:class:`ViewItem`, :class:`int`, :class:`str`]
             The item, ``id``, or item ``custom_id`` to remove from the container.
         """
 
@@ -155,7 +155,7 @@ def remove_item(self, item: Item | str | int) -> Self:
             pass
         return self
 
-    def get_item(self, id: str | int) -> Item | None:
+    def get_item(self, id: str | int) -> ViewItem | None:
         """Get an item from this container. Roughly equivalent to `utils.get(container.items, ...)`.
         If an ``int`` is provided, the item will be retrieved by ``id``, otherwise by ``custom_id``.
         This method will also search for nested items.
@@ -167,7 +167,7 @@ def get_item(self, id: str | int) -> Item | None:
 
         Returns
         -------
-        Optional[:class:`Item`]
+        Optional[:class:`ViewItem`]
             The item with the matching ``id`` or ``custom_id`` if it exists.
         """
         if not id:
@@ -183,7 +183,7 @@ def get_item(self, id: str | int) -> Item | None:
 
     def add_row(
         self,
-        *items: Item,
+        *items: ViewItem,
         id: int | None = None,
     ) -> Self:
         """Adds an :class:`ActionRow` to the container.
@@ -204,8 +204,8 @@ def add_row(
 
     def add_section(
         self,
-        *items: Item,
-        accessory: Item,
+        *items: ViewItem,
+        accessory: ViewItem,
         id: int | None = None,
     ) -> Self:
         """Adds a :class:`Section` to the container.
@@ -215,10 +215,10 @@ def add_section(
 
         Parameters
         ----------
-        *items: :class:`Item`
+        *items: :class:`ViewItem`
             The items contained in this section, up to 3.
             Currently only supports :class:`~discord.ui.TextDisplay`.
-        accessory: Optional[:class:`Item`]
+        accessory: Optional[:class:`ViewItem`]
             The section's accessory. This is displayed in the top right of the section.
             Currently only supports :class:`~discord.ui.Button` and :class:`~discord.ui.Thumbnail`.
         id: Optional[:class:`int`]
@@ -246,7 +246,7 @@ def add_text(self, content: str, id: int | None = None) -> Self:
 
     def add_gallery(
         self,
-        *items: Item,
+        *items: ViewItem,
         id: int | None = None,
     ) -> Self:
         """Adds a :class:`MediaGallery` to the container.
@@ -338,7 +338,7 @@ def colour(self, value: int | Colour | None):  # type: ignore
 
     color = colour
 
-    @Item.view.setter
+    @ViewItem.view.setter
     def view(self, value):
         self._view = value
         for item in self.items:
@@ -365,13 +365,13 @@ def refresh_component(self, component: ContainerComponent) -> None:
             x.refresh_component(y)
             i += 1
 
-    def disable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
+    def disable_all_items(self, *, exclusions: list[ViewItem] | None = None) -> Self:
         """
         Disables all buttons and select menus in the container.
 
         Parameters
         ----------
-        exclusions: Optional[List[:class:`Item`]]
+        exclusions: Optional[List[:class:`ViewItem`]]
             A list of items in `self.items` to not disable from the view.
         """
         for item in self.walk_items():
@@ -381,13 +381,13 @@ def disable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
                 item.disabled = True
         return self
 
-    def enable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
+    def enable_all_items(self, *, exclusions: list[ViewItem] | None = None) -> Self:
         """
         Enables all buttons and select menus in the container.
 
         Parameters
         ----------
-        exclusions: Optional[List[:class:`Item`]]
+        exclusions: Optional[List[:class:`ViewItem`]]
             A list of items in `self.items` to not enable from the view.
         """
         for item in self.walk_items():
@@ -397,7 +397,7 @@ def enable_all_items(self, *, exclusions: list[Item] | None = None) -> Self:
                 item.disabled = False
         return self
 
-    def walk_items(self) -> Iterator[Item]:
+    def walk_items(self) -> Iterator[ViewItem]:
         for item in self.items:
             if hasattr(item, "walk_items"):
                 yield from item.walk_items()

discord/ui/file.py

@@ -5,7 +5,7 @@
 
 from ..components import FileComponent, UnfurledMediaItem, _component_factory
 from ..enums import ComponentType
-from .item import Item
+from .item import ViewItem
 
 __all__ = ("File",)
 
@@ -18,7 +18,7 @@
 V = TypeVar("V", bound="DesignerView", covariant=True)
 
 
-class File(Item[V]):
+class File(ViewItem[V]):
     """Represents a UI File.
 
     .. note::

discord/ui/item.py

@@ -163,7 +163,7 @@ def __init__(self):
         self._view: V | None = None
         self._row: int | None = None
         self._rendered_row: int | None = None
-        self.parent: Item | BaseView | None = self.view
+        self.parent: ViewItem | BaseView | None = self.view
 
     @property
     def row(self) -> int | None:
@@ -254,14 +254,14 @@ class ModalItem(Item[M]):
 
     def __init__(self):
         super().__init__()
-        self._modal: V | None = None
-        self.parent: Item | BaseModal | None = self.modal
+        self._modal: M | None = None
+        self.parent: ModalItem | BaseModal | None = self.modal
 
     def refresh_from_modal(self, interaction: Interaction, data: dict) -> None:
         return None
 
     @property
-    def modal(self) -> V | None:
+    def modal(self) -> M | None:
         """Gets the parent modal associated with this item. This is typically set
         automatically when the item is added to a modal.
 

discord/ui/media_gallery.py

@@ -5,7 +5,7 @@
 from ..components import MediaGallery as MediaGalleryComponent
 from ..components import MediaGalleryItem
 from ..enums import ComponentType
-from .item import Item
+from .item import ViewItem
 
 __all__ = ("MediaGallery",)
 
@@ -20,7 +20,7 @@
 V = TypeVar("V", bound="DesignerView", covariant=True)
 
 
-class MediaGallery(Item[V]):
+class MediaGallery(ViewItem[V]):
     """Represents a UI Media Gallery. Galleries may contain up to 10 :class:`MediaGalleryItem` objects.
 
     .. versionadded:: 2.7
@@ -105,10 +105,6 @@ def add_item(
 
         return self.append_item(item)
 
-    @Item.view.setter
-    def view(self, value):
-        self._view = value
-
     @property
     def type(self) -> ComponentType:
         return self._underlying.type