Merge branch 'master' into choices

Signed-off-by: Lumouille <[email protected]>

Author: Lumabots

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

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/[email protected].0
+        uses: crowdin/[email protected].1
         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/[email protected].0
+        uses: crowdin/[email protected].1
         with:
           upload_sources: true
           upload_translations: false

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
   #          - --remove-duplicate-keys
   #          - --remove-unused-variables
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -53,10 +53,12 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2598](https://github.com/Pycord-Development/pycord/pull/2598))
 - Added the ability to change the API's base URL with `Route.API_BASE_URL`.
   ([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
-- Added the ability to pass a `datetime.time` object to `format_dt`
+- Added the ability to pass a `datetime.time` object to `format_dt`.
   ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
 - Added support for `Literal[...]` to define command choices.
   ([#2782](https://github.com/Pycord-Development/pycord/pull/2782))
+- Added `discord.Interaction.created_at`.
+  ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 
 ### Fixed
 
@@ -107,12 +109,18 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2739](https://github.com/Pycord-Development/pycord/pull/2739))
 - Fixed missing `None` type hints in `Select.__init__`.
   ([#2746](https://github.com/Pycord-Development/pycord/pull/2746))
+- Fixed `TypeError` when using `Flag` with Python 3.11+.
+  ([#2759](https://github.com/Pycord-Development/pycord/pull/2759))
+- Fixed `TypeError` when specifying `thread_name` in `Webhook.send`.
+  ([#2761](https://github.com/Pycord-Development/pycord/pull/2761))
 - Updated `valid_locales` to support `in` and `es-419`.
   ([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
 - Fixed `Webhook.edit` not working with `attachments=[]`.
   ([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
 - Fixed GIF-based `Sticker` returning the wrong `url`.
   ([#2781](https://github.com/Pycord-Development/pycord/pull/2781))
+- Fixed `VoiceClient` crashing randomly while receiving audio
+  ([#2800](https://github.com/Pycord-Development/pycord/pull/2800))
 
 ### Changed
 
@@ -130,6 +138,8 @@ These changes are available on the `master` branch, but have not yet been releas
   changes. ([#2671](https://github.com/Pycord-Development/pycord/pull/2671))
 - `Entitlement.ends_at` can now be `None`.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
+- Changed the default value of `ApplicationCommand.nsfw` to `False`.
+  ([#2797](https://github.com/Pycord-Development/pycord/pull/2797))
 
 ### Deprecated
 
@@ -140,6 +150,11 @@ These changes are available on the `master` branch, but have not yet been releas
 - Deprecated `Interaction.cached_channel` in favor of `Interaction.channel`.
   ([#2658](https://github.com/Pycord-Development/pycord/pull/2658))
 
+### Removed
+
+- Removed deprecated support for `Option` in `BridgeCommand`. Use `BridgeOption`
+  instead. ([#2731])(https://github.com/Pycord-Development/pycord/pull/2731))
+
 ## [2.6.1] - 2024-09-15
 
 ### Fixed

discord/bot.py

@@ -328,12 +328,17 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                             ]:
                                 # We have a difference
                                 return True
-                    elif getattr(cmd, check, None) != match.get(check):
-                        # We have a difference
-                        if (
+                    elif (attr := getattr(cmd, check, None)) != (
+                        found := match.get(check)
+                    ):
+                        # We might have a difference
+                        if "localizations" in check and bool(attr) == bool(found):
+                            # unlike other attrs, localizations are MISSING by default
+                            continue
+                        elif (
                             check == "default_permission"
-                            and getattr(cmd, check) is True
-                            and match.get(check) is None
+                            and attr is True
+                            and found is None
                         ):
                             # This is a special case
                             # TODO: Remove for perms v2

discord/commands/core.py

@@ -233,7 +233,7 @@ def __init__(self, func: Callable, **kwargs) -> None:
             "__default_member_permissions__",
             kwargs.get("default_member_permissions", None),
         )
-        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", None))
+        self.nsfw: bool | None = getattr(func, "__nsfw__", kwargs.get("nsfw", False))
 
         integration_types = getattr(
             func, "__integration_types__", kwargs.get("integration_types", None)
@@ -1267,7 +1267,7 @@ def __init__(
         self.default_member_permissions: Permissions | None = kwargs.get(
             "default_member_permissions", None
         )
-        self.nsfw: bool | None = kwargs.get("nsfw", None)
+        self.nsfw: bool | None = kwargs.get("nsfw", False)
 
         integration_types = kwargs.get("integration_types", None)
         contexts = kwargs.get("contexts", None)

discord/ext/bridge/core.py

@@ -98,26 +98,12 @@ class BridgeExtCommand(Command):
     def __init__(self, func, **kwargs):
         super().__init__(func, **kwargs)
 
-        # TODO: v2.7: Remove backwards support for Option in bridge commands.
-        for name, option in self.params.items():
+        for option in self.params.values():
             if isinstance(option.annotation, Option) and not isinstance(
                 option.annotation, BridgeOption
             ):
-                # Warn not to do this
-                warn_deprecated(
-                    "Using Option for bridge commands",
-                    "BridgeOption",
-                    "2.5",
-                    "2.7",
-                    reference="https://github.com/Pycord-Development/pycord/pull/2417",
-                    stacklevel=6,
-                )
-                # Override the convert method of the parameter's annotated Option.
-                # We can use the convert method from BridgeOption, and bind "self"
-                # using a manual invocation of the descriptor protocol.
-                # Definitely not a good approach, but gets the job done until removal.
-                self.params[name].annotation.convert = BridgeOption.convert.__get__(
-                    self.params[name].annotation
+                raise TypeError(
+                    f"{option.annotation.__class__.__name__} is not supported in bridge commands. Use BridgeOption instead."
                 )
 
     async def dispatch_error(self, ctx: BridgeExtContext, error: Exception) -> None:

discord/ext/commands/flags.py

@@ -31,12 +31,11 @@
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Iterator, Literal, Pattern, TypeVar, Union
 
-from discord.utils import MISSING, MissingField, maybe_coroutine, resolve_annotation
-
-if sys.version_info >= (3, 11):
-    _MISSING = MissingField
-else:
-    _MISSING = MISSING
+from discord.utils import (
+    MISSING,
+    maybe_coroutine,
+    resolve_annotation,
+)
 
 from .converter import run_converters
 from .errors import (
@@ -59,6 +58,10 @@
     from .context import Context
 
 
+def _missing_field_factory() -> field:
+    return field(default_factory=lambda: MISSING)
+
+
 @dataclass
 class Flag:
     """Represents a flag parameter for :class:`FlagConverter`.
@@ -86,13 +89,13 @@ class Flag:
         Whether multiple given values overrides the previous value.
     """
 
-    name: str = _MISSING
+    name: str = _missing_field_factory()
     aliases: list[str] = field(default_factory=list)
-    attribute: str = _MISSING
-    annotation: Any = _MISSING
-    default: Any = _MISSING
-    max_args: int = _MISSING
-    override: bool = _MISSING
+    attribute: str = _missing_field_factory()
+    annotation: Any = _missing_field_factory()
+    default: Any = _missing_field_factory()
+    max_args: int = _missing_field_factory()
+    override: bool = _missing_field_factory()
     cast_to_dict: bool = False
 
     @property

discord/guild.py

@@ -88,7 +88,7 @@
 from .welcome_screen import WelcomeScreen, WelcomeScreenChannel
 from .widget import Widget
 
-__all__ = ("Guild",)
+__all__ = ("BanEntry", "Guild")
 
 MISSING = utils.MISSING
 

discord/interactions.py

@@ -26,6 +26,7 @@
 from __future__ import annotations
 
 import asyncio
+import datetime
 from typing import TYPE_CHECKING, Any, Coroutine, Union
 
 from . import utils
@@ -300,6 +301,11 @@ def guild(self) -> Guild | None:
             return self._guild
         return self._state and self._state._get_guild(self.guild_id)
 
+    @property
+    def created_at(self) -> datetime.datetime:
+        """Returns the interaction's creation time in UTC."""
+        return utils.snowflake_time(self.id)
+
     def is_command(self) -> bool:
         """Indicates whether the interaction is an application command."""
         return self.type == InteractionType.application_command