diff --git a/discord/commands/options.py b/discord/commands/options.py index 21dd422c43..525d18deb4 100644 --- a/discord/commands/options.py +++ b/discord/commands/options.py @@ -59,6 +59,7 @@ from ..enums import ChannelType from ..enums import Enum as DiscordEnum from ..enums import SlashCommandOptionType +from ..errors import InvalidArgument from ..utils import MISSING, basic_autocomplete if TYPE_CHECKING: @@ -253,9 +254,15 @@ def __init__( self.description = description or "No description provided" self.channel_types: list[ChannelType] = kwargs.pop("channel_types", []) + self.file_types: list[str] = kwargs.pop("file_types", []) + + if self.channel_types and self.file_types: + raise InvalidArgument("cannot pass both channel_types and file_types") if self.channel_types: self.input_type = SlashCommandOptionType.channel + elif self.file_types: + self.input_type = SlashCommandOptionType.attachment elif isinstance(input_type, SlashCommandOptionType): self.input_type = input_type else: @@ -452,6 +459,8 @@ def to_dict(self) -> dict: as_dict["min_length"] = self.min_length if self.max_length is not None: as_dict["max_length"] = self.max_length + if self.file_types: + as_dict["file_types"] = self.file_types return as_dict diff --git a/discord/components.py b/discord/components.py index 8db2c48506..7cc37f7dfc 100644 --- a/discord/components.py +++ b/discord/components.py @@ -1398,6 +1398,7 @@ class FileUpload(Component): "max_values", "required", "id", + "file_types", ) __repr_info__: ClassVar[tuple[str, ...]] = __slots__ @@ -1410,6 +1411,7 @@ def __init__(self, data: FileUploadComponentPayload): self.min_values: int | None = data.get("min_values", None) self.max_values: int | None = data.get("max_values", None) self.required: bool = data.get("required", True) + self.file_types: list[str] | None = data.get("file_types") def to_dict(self) -> FileUploadComponentPayload: payload = { @@ -1428,6 +1430,9 @@ def to_dict(self) -> FileUploadComponentPayload: if not self.required: payload["required"] = self.required + if self.file_types: + payload["file_types"] = self.file_types + return payload # type: ignore diff --git a/discord/types/components.py b/discord/types/components.py index 6a83fb5740..0224122296 100644 --- a/discord/types/components.py +++ b/discord/types/components.py @@ -174,6 +174,7 @@ class FileUploadComponent(BaseComponent): max_values: NotRequired[int] min_values: NotRequired[int] required: NotRequired[bool] + file_types: NotRequired[list[str]] class RadioGroupOption(TypedDict): diff --git a/discord/ui/file_upload.py b/discord/ui/file_upload.py index f7d15e394d..f4dfd6cb67 100644 --- a/discord/ui/file_upload.py +++ b/discord/ui/file_upload.py @@ -58,6 +58,9 @@ class FileUpload(ModalItem): Whether the file upload field is required or not. Defaults to ``True``. id: :class:`int` | :obj:`None` The file upload field's ID. + file_types: list[:class:`str`] + The types accepted in this file upload. This only filters by file extension. + See `Discord's documentation `__ for more information. """ __item_repr_attributes__: tuple[str, ...] = ( @@ -66,6 +69,7 @@ class FileUpload(ModalItem): "max_values", "custom_id", "id", + "file_types", ) def __init__( @@ -86,6 +90,8 @@ def __init__( raise TypeError( f"expected custom_id to be str, not {custom_id.__class__.__name__}" ) + if file_types and len(file_types) > 10: + raise ValueError("file_types must be less than 10 items") if not isinstance(required, bool): raise TypeError(f"required must be bool not {required.__class__.__name__}") @@ -98,6 +104,7 @@ def __init__( max_values=max_values, required=required, id=id, + file_types=file_types, ) def _generate_underlying( @@ -107,6 +114,7 @@ def _generate_underlying( max_values: int | None = None, required: bool | None = None, id: int | None = None, + file_types: list[str] | None = None, ) -> FileUploadComponent: super()._generate_underlying(FileUploadComponent) return FileUploadComponent._raw_construct( @@ -116,6 +124,7 @@ def _generate_underlying( max_values=max_values if max_values is not None else self.max_values, required=required if required is not None else self.required, id=id or self.id, + file_types=file_types, ) @property