Merge branch 'master' into feat/bypass-slowmode

Signed-off-by: Lala Sabathil <lala@pycord.dev>

Author: Lulalaby

.github/workflows/codeql.yml

@@ -28,10 +28,10 @@ jobs:
       - name: "Checkout repository"
         uses: actions/checkout@v5
       - name: "Initialize CodeQL"
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
       - name: "Autobuild"
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
       - name: "Perform CodeQL Analysis"
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/docs-localization-download.yml

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/github-action@v2.11.0
+        uses: crowdin/github-action@v2.12.0
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/docs-localization-upload.yml

@@ -44,7 +44,7 @@ jobs:
           sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
         working-directory: ./docs
       - name: "Crowdin"
-        uses: crowdin/github-action@v2.11.0
+        uses: crowdin/github-action@v2.12.0
         with:
           upload_sources: true
           upload_translations: false

.github/workflows/release.yml

@@ -198,7 +198,7 @@ jobs:
           python3 -m build --sdist
           python3 -m build --wheel
       - name: "Create GitHub Release"
-        uses: softprops/action-gh-release@v2.3.3
+        uses: softprops/action-gh-release@v2.4.1
         id: gh-release
         with:
           tag_name: "v${{ inputs.version }}"

.pre-commit-config.yaml

@@ -21,17 +21,17 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.21.0
     hooks:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.1
+    rev: 7.0.0
     hooks:
       - id: isort
         exclude: \.(po|pot|yml|yaml)$
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
       - id: black
         args: [--safe, --quiet]

CHANGELOG.md

@@ -28,6 +28,8 @@ These changes are available on the `master` branch, but have not yet been releas
   - Adds pre-typed and pre-constructed with select_type `ui.Select` aliases for the
     different select types: `ui.StringSelect`, `ui.UserSelect`, `ui.RoleSelect`,
     `ui.MentionableSelect`, and `ui.ChannelSelect`.
+- Added `ui.FileUpload` for modals and the `FileUpload` component.
+  ([#2938](https://github.com/Pycord-Development/pycord/pull/2938))
 - Added `Permissions.bypass_slowmode`.
   ([#2939](https://github.com/Pycord-Development/pycord/pull/2939))
 
@@ -47,6 +49,15 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2924](https://github.com/Pycord-Development/pycord/pull/2924))
 - Fixed OPUS Decode Error when recording audio.
   ([#2925](https://github.com/Pycord-Development/pycord/pull/2925))
+- Fixed a `TypeError` when typing `ui.Select` without providing optional type arguments.
+  ([#2943](https://github.com/Pycord-Development/pycord/pull/2943))
+- Fixed modal input values being misordered when using the `row` parameter and inserting
+  items out of row order.
+  ([#2938](https://github.com/Pycord-Development/pycord/pull/2938))
+- Fixed a KeyError when a text input is left blank in a modal.
+  ([#2938](https://github.com/Pycord-Development/pycord/pull/2938))
+- Fixed `TypeError` when using Python 3.12+ `type` syntax for typing slash command
+  parameters. ([#2952](https://github.com/Pycord-Development/pycord/pull/2952))
 
 ### Removed
 
@@ -108,6 +119,9 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
 - Added the ability to pass a `datetime.time` object to `format_dt`.
   ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
+- Added the ability to pass an `overlap` parameter to the `loop` decorator and `Loop`
+  class, allowing concurrent iterations if enabled.
+  ([#2765](https://github.com/Pycord-Development/pycord/pull/2765))
 - Added various missing channel parameters and allow `default_reaction_emoji` to be
   `None`. ([#2772](https://github.com/Pycord-Development/pycord/pull/2772))
 - Added support for type hinting slash command options with `typing.Annotated`.

discord/__init__.py

@@ -47,6 +47,7 @@
 from .flags import *
 from .guild import *
 from .http import *
+from .incidents import *
 from .integrations import *
 from .interactions import *
 from .invite import *

discord/channel.py

@@ -2909,9 +2909,7 @@ def __init__(
         self._update(guild, data)
 
     def __repr__(self) -> str:
-        return (
-            f"<CategoryChannel id={self.id} name={self.name!r} position={self.position}"
-        )
+        return f"<CategoryChannel id={self.id} name={self.name!r} position={self.position}>"
 
     def _update(self, guild: Guild, data: CategoryChannelPayload) -> None:
         # This data will always exist

discord/commands/options.py

@@ -28,7 +28,15 @@
 import logging
 import types
 from enum import Enum
-from typing import TYPE_CHECKING, Literal, Optional, Type, Union, get_args
+from typing import (
+    TYPE_CHECKING,
+    Literal,
+    Optional,
+    Type,
+    TypeAliasType,
+    Union,
+    get_args,
+)
 
 from ..abc import GuildChannel, Mentionable
 from ..channel import (
@@ -197,6 +205,7 @@ def __init__(
         if self.name is not None:
             self.name = str(self.name)
         self._parameter_name = self.name  # default
+        input_type = self._parse_type_alias(input_type)
         input_type = self._strip_none_type(input_type)
         self._raw_type: InputType | tuple = input_type
 
@@ -367,6 +376,12 @@ def __init__(
         if input_type is None:
             raise TypeError("input_type cannot be NoneType.")
 
+    @staticmethod
+    def _parse_type_alias(input_type: InputType) -> InputType:
+        if isinstance(input_type, TypeAliasType):
+            return input_type.__value__
+        return input_type
+
     @staticmethod
     def _strip_none_type(input_type):
         if isinstance(input_type, SlashCommandOptionType):

discord/components.py

@@ -50,6 +50,7 @@
     from .types.components import Component as ComponentPayload
     from .types.components import ContainerComponent as ContainerComponentPayload
     from .types.components import FileComponent as FileComponentPayload
+    from .types.components import FileUploadComponent as FileUploadComponentPayload
     from .types.components import InputText as InputTextComponentPayload
     from .types.components import LabelComponent as LabelComponentPayload
     from .types.components import MediaGalleryComponent as MediaGalleryComponentPayload
@@ -81,6 +82,7 @@
     "Container",
     "Label",
     "SelectDefaultValue",
+    "FileUpload",
 )
 
 C = TypeVar("C", bound="Component")
@@ -938,7 +940,6 @@ def url(self, value: str) -> None:
 
     @classmethod
     def from_dict(cls, data: UnfurledMediaItemPayload, state=None) -> UnfurledMediaItem:
-
         r = cls(data.get("url"))
         r.proxy_url = data.get("proxy_url")
         r.height = data.get("height")
@@ -1347,6 +1348,71 @@ def walk_components(self) -> Iterator[Component]:
         yield from [self.component]
 
 
+class FileUpload(Component):
+    """Represents an File Upload component from the Discord Bot UI Kit.
+
+    This inherits from :class:`Component`.
+
+    .. note::
+
+        This class is not useable by end-users; see :class:`discord.ui.FileUpload` instead.
+
+    .. versionadded:: 2.7
+
+    Attributes
+    ----------
+    custom_id: Optional[:class:`str`]
+        The custom ID of the file upload field that gets received during an interaction.
+    min_values: Optional[:class:`int`]
+        The minimum number of files that must be uploaded.
+    max_values: Optional[:class:`int`]
+        The maximum number of files that can be uploaded.
+    required: Optional[:class:`bool`]
+        Whether the file upload field is required or not. Defaults to `True`.
+    id: Optional[:class:`int`]
+        The file upload's ID.
+    """
+
+    __slots__: tuple[str, ...] = (
+        "type",
+        "custom_id",
+        "min_values",
+        "max_values",
+        "required",
+        "id",
+    )
+
+    __repr_info__: ClassVar[tuple[str, ...]] = __slots__
+    versions: tuple[int, ...] = (1, 2)
+
+    def __init__(self, data: FileUploadComponentPayload):
+        self.type = ComponentType.file_upload
+        self.id: int | None = data.get("id")
+        self.custom_id = data["custom_id"]
+        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)
+
+    def to_dict(self) -> FileUploadComponentPayload:
+        payload = {
+            "type": 19,
+            "custom_id": self.custom_id,
+        }
+        if self.id is not None:
+            payload["id"] = self.id
+
+        if self.min_values is not None:
+            payload["min_values"] = self.min_values
+
+        if self.max_values is not None:
+            payload["max_values"] = self.max_values
+
+        if not self.required:
+            payload["required"] = self.required
+
+        return payload  # type: ignore
+
+
 COMPONENT_MAPPINGS = {
     1: ActionRow,
     2: Button,
@@ -1364,6 +1430,7 @@ def walk_components(self) -> Iterator[Component]:
     14: Separator,
     17: Container,
     18: Label,
+    19: FileUpload,
 }
 
 STATE_COMPONENTS = (Section, Container, Thumbnail, MediaGallery, FileComponent)