merge upstream

Author: DA-344

discord/components.py

@@ -54,13 +54,13 @@
     from .types.components import MediaGalleryComponent as MediaGalleryComponentPayload
     from .types.components import MediaGalleryItem as MediaGalleryItemPayload
     from .types.components import SectionComponent as SectionComponentPayload
+    from .types.components import SelectDefaultValue as SelectDefaultValuePayload
     from .types.components import SelectMenu as SelectMenuPayload
     from .types.components import SelectOption as SelectOptionPayload
     from .types.components import SeparatorComponent as SeparatorComponentPayload
     from .types.components import TextDisplayComponent as TextDisplayComponentPayload
     from .types.components import ThumbnailComponent as ThumbnailComponentPayload
     from .types.components import UnfurledMediaItem as UnfurledMediaItemPayload
-    from .types.components import SelectDefaultValue as SelectDefaultValuePayload
 
 __all__ = (
     "Component",
@@ -459,7 +459,9 @@ def __init__(self, data: SelectMenuPayload):
             try_enum(ChannelType, ct) for ct in data.get("channel_types", [])
         ]
         self.required: bool | None = data.get("required")
-        self.default_values: list[SelectDefaultValue] = SelectDefaultValue._from_data(data.get("default_values"))
+        self.default_values: list[SelectDefaultValue] = SelectDefaultValue._from_data(
+            data.get("default_values")
+        )
 
     def to_dict(self) -> SelectMenuPayload:
         payload: SelectMenuPayload = {
@@ -511,10 +513,15 @@ def __init__(
         self.type: SelectDefaultValueType = type
 
     @classmethod
-    def _from_data(cls, default_values: list[SelectDefaultValuePayload] | None) -> list[SelectDefaultValue]:
+    def _from_data(
+        cls, default_values: list[SelectDefaultValuePayload] | None
+    ) -> list[SelectDefaultValue]:
         if not default_values:
             return []
-        return [cls(id=int(d['id']), type=try_enum(SelectDefaultValueType, d['type'])) for d in default_values]
+        return [
+            cls(id=int(d["id"]), type=try_enum(SelectDefaultValueType, d["type"]))
+            for d in default_values
+        ]
 
     def to_dict(self) -> SelectDefaultValuePayload:
         return {

discord/types/components.py

@@ -37,7 +37,7 @@
 ButtonStyle = Literal[1, 2, 3, 4, 5, 6]
 InputTextStyle = Literal[1, 2]
 SeparatorSpacingSize = Literal[1, 2]
-SelectDefaultValueType = Literal['channel', 'role', 'user']
+SelectDefaultValueType = Literal["channel", "role", "user"]
 
 
 class BaseComponent(TypedDict):

discord/ui/select.py

@@ -25,13 +25,13 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 import inspect
 import os
+from collections.abc import Sequence
 from typing import TYPE_CHECKING, Callable, TypeVar
 
 from ..channel import _threaded_guild_channel_factory
-from ..components import SelectMenu, SelectOption, SelectDefaultValue
+from ..components import SelectDefaultValue, SelectMenu, SelectOption
 from ..emoji import AppEmoji, GuildEmoji
 from ..enums import ChannelType, ComponentType, SelectDefaultValueType
 from ..errors import InvalidArgument
@@ -255,12 +255,29 @@ def _handle_default_values(self, default_values: Sequence[Snowflake] | None, sel
 
         from discord import abc  # > circular import <
 
-        instances_mapping: dict[type, tuple[tuple[ComponentType, ...], SelectDefaultValueType]] = {
-            Role: ((ComponentType.role_select, ComponentType.mentionable_select), SelectDefaultValueType.role),
-            User: ((ComponentType.user_select, ComponentType.mentionable_select), SelectDefaultValueType.user),
-            Member: ((ComponentType.user_select, ComponentType.mentionable_select), SelectDefaultValueType.user),
-            abc.User: ((ComponentType.user_select, ComponentType.mentionable_select), SelectDefaultValueType.user),
-            abc.GuildChannel: ((ComponentType.channel_select,), SelectDefaultValueType.channel),
+        instances_mapping: dict[
+            type, tuple[tuple[ComponentType, ...], SelectDefaultValueType]
+        ] = {
+            Role: (
+                (ComponentType.role_select, ComponentType.mentionable_select),
+                SelectDefaultValueType.role,
+            ),
+            User: (
+                (ComponentType.user_select, ComponentType.mentionable_select),
+                SelectDefaultValueType.user,
+            ),
+            Member: (
+                (ComponentType.user_select, ComponentType.mentionable_select),
+                SelectDefaultValueType.user,
+            ),
+            abc.User: (
+                (ComponentType.user_select, ComponentType.mentionable_select),
+                SelectDefaultValueType.user,
+            ),
+            abc.GuildChannel: (
+                (ComponentType.channel_select,),
+                SelectDefaultValueType.channel,
+            ),
         }
 
         for dv in default_values:
@@ -277,10 +294,14 @@ def _handle_default_values(self, default_values: Sequence[Snowflake] | None, sel
             try:
                 sel_type, def_type = instances_mapping[obj_type]
             except KeyError:
-                raise TypeError(f'{dv.__class__.__name__} is not a valid instance for default_values')
+                raise TypeError(
+                    f"{dv.__class__.__name__} is not a valid instance for default_values"
+                )
 
             if select_type not in sel_type:
-                raise TypeError(f'{dv.__class__.__name__} objects can not be set as a default value for {select_type.value} selects')
+                raise TypeError(
+                    f"{dv.__class__.__name__} objects can not be set as a default value for {select_type.value} selects"
+                )
 
             ret.append(SelectDefaultValue(id=obj_id, type=def_type))
 
@@ -425,7 +446,9 @@ def add_default_value(
             The number of default select values exceeds 25.
         """
         if type is MISSING and self.type is ComponentType.mentionable_select:
-            raise TypeError('type is required when select is of type mentionable_select')
+            raise TypeError(
+                "type is required when select is of type mentionable_select"
+            )
 
         types = {
             ComponentType.user_select: SelectDefaultValueType.user,
@@ -785,7 +808,9 @@ def select(
         raise TypeError("channel_types may only be specified for channel selects")
 
     if default_values is not None and select_type is ComponentType.string_select:
-        raise TypeError("default_values may only be specified for selects other than string selects")
+        raise TypeError(
+            "default_values may only be specified for selects other than string selects"
+        )
 
     def decorator(func: ItemCallbackType) -> ItemCallbackType:
         if not inspect.iscoroutinefunction(func):