Merge remote-tracking branch 'pycord/master' into merge-upstream

Author: Paillat-dev

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

@@ -41,7 +41,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

@@ -45,7 +45,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

CHANGELOG.md

@@ -53,8 +53,10 @@ 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 `discord.Interaction.created_at`.
+  ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 
 ### Fixed
 
@@ -105,12 +107,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
 
@@ -140,6 +148,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

@@ -293,7 +293,7 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                     "integration_types": None,
                 }
                 for check, value in to_check.items():
-                    if type(to_check[check]) == list:
+                    if type(value) == list:
                         # We need to do some falsy conversion here
                         # The API considers False (autocomplete) and [] (choices) to be falsy values
                         falsy_vals = (False, [])
@@ -357,12 +357,12 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
 
         # Now let's see if there are any commands on discord that we need to delete
         for cmd, value_ in registered_commands_dict.items():
-            match = get(pending, name=registered_commands_dict[cmd]["name"])
+            match = get(pending, name=value_["name"])
             if match is None:
                 # We have this command registered but not in our list
                 return_value.append(
                     {
-                        "command": registered_commands_dict[cmd]["name"],
+                        "command": value_["name"],
                         "id": int(value_["id"]),
                         "action": "delete",
                     }

discord/ext/bridge/core.py

@@ -96,23 +96,11 @@ 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,
+                raise TypeError(
+                    f"{option.annotation.__class__.__name__} is not supported in bridge commands. Use BridgeOption instead."
                 )
-                # 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)
 
     async def dispatch_error(self, ctx: BridgeExtContext, error: Exception) -> None:
         await super().dispatch_error(ctx, error)

discord/ext/commands/flags.py

@@ -55,6 +55,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`.
@@ -82,14 +86,14 @@ class Flag:
         Whether multiple given values overrides the previous value.
     """
 
-    name: str | Undefined = MISSING
+    name: str | Undefined = _missing_field_factory()
     aliases: list[str] = field(default_factory=list)
-    attribute: str | Undefined = MISSING
-    annotation: Any | Undefined = MISSING
-    default: Any | Undefined = MISSING
-    max_args: int | Undefined = MISSING
-    override: bool | Undefined = MISSING
-    cast_to_dict: bool = False
+    attribute: str | Undefined = _missing_field_factory()
+    annotation: Any | Undefined = _missing_field_factory()
+    default: Any | Undefined = _missing_field_factory()
+    max_args: int | Undefined = _missing_field_factory()
+    override: bool | Undefined = _missing_field_factory()
+    cast_to_dict: bool | Undefined = False
 
     @property
     def required(self) -> bool:

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
@@ -282,6 +283,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

discord/ui/view.py

@@ -32,7 +32,7 @@
 import traceback
 from functools import partial
 from itertools import groupby
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterator, Sequence
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterator, Sequence, TypeVar
 
 from ..components import ActionRow as ActionRowComponent
 from ..components import Button as ButtonComponent
@@ -51,6 +51,8 @@
     from ..state import ConnectionState
     from ..types.components import Component as ComponentPayload
 
+V = TypeVar("V", bound="View", covariant=True)
+
 
 def _walk_all_components(components: list[Component]) -> Iterator[Component]:
     for item in components:
@@ -60,7 +62,7 @@ def _walk_all_components(components: list[Component]) -> Iterator[Component]:
             yield item
 
 
-def _component_to_item(component: Component) -> Item:
+def _component_to_item(component: Component) -> Item[V]:
     if isinstance(component, ButtonComponent):
         from .button import Button
 
@@ -75,7 +77,7 @@ def _component_to_item(component: Component) -> Item:
 class _ViewWeights:
     __slots__ = ("weights",)
 
-    def __init__(self, children: list[Item]):
+    def __init__(self, children: list[Item[V]]):
         self.weights: list[int] = [0, 0, 0, 0, 0]
 
         key = lambda i: sys.maxsize if i.row is None else i.row
@@ -84,14 +86,14 @@ def __init__(self, children: list[Item]):
             for item in group:
                 self.add_item(item)
 
-    def find_open_space(self, item: Item) -> int:
+    def find_open_space(self, item: Item[V]) -> int:
         for index, weight in enumerate(self.weights):
             if weight + item.width <= 5:
                 return index
 
         raise ValueError("could not find open space for item")
 
-    def add_item(self, item: Item) -> None:
+    def add_item(self, item: Item[V]) -> None:
         if item.row is not None:
             total = self.weights[item.row] + item.width
             if total > 5:
@@ -103,7 +105,7 @@ def add_item(self, item: Item) -> None:
             self.weights[index] += item.width
             item._rendered_row = index
 
-    def remove_item(self, item: Item) -> None:
+    def remove_item(self, item: Item[V]) -> None:
         if item._rendered_row is not None:
             self.weights[item._rendered_row] -= item.width
             item._rendered_row = None
@@ -161,15 +163,15 @@ def __init_subclass__(cls) -> None:
 
     def __init__(
         self,
-        *items: Item,
+        *items: Item[V],
         timeout: float | None = 180.0,
         disable_on_timeout: bool = False,
     ):
         self.timeout = timeout
         self.disable_on_timeout = disable_on_timeout
-        self.children: list[Item] = []
+        self.children: list[Item[V]] = []
         for func in self.__view_children_items__:
-            item: Item = func.__discord_ui_model_type__(**func.__discord_ui_model_kwargs__)
+            item: Item[V] = func.__discord_ui_model_type__(**func.__discord_ui_model_kwargs__)
             item.callback = partial(func, self, item)
             item._view = self
             setattr(self, func.__name__, item)
@@ -209,7 +211,7 @@ async def __timeout_task_impl(self) -> None:
             await asyncio.sleep(self.__timeout_expiry - now)
 
     def to_components(self) -> list[dict[str, Any]]:
-        def key(item: Item) -> int:
+        def key(item: Item[V]) -> int:
             return item._rendered_row or 0
 
         children = sorted(self.children, key=key)
@@ -261,7 +263,7 @@ def _expires_at(self) -> float | None:
             return time.monotonic() + self.timeout
         return None
 
-    def add_item(self, item: Item) -> None:
+    def add_item(self, item: Item[V]) -> None:
         """Adds an item to the view.
 
         Parameters
@@ -289,7 +291,7 @@ def add_item(self, item: Item) -> None:
         item._view = self
         self.children.append(item)
 
-    def remove_item(self, item: Item) -> None:
+    def remove_item(self, item: Item[V]) -> None:
         """Removes an item from the view.
 
         Parameters
@@ -310,7 +312,7 @@ def clear_items(self) -> None:
         self.children.clear()
         self.__weights.clear()
 
-    def get_item(self, custom_id: str) -> Item | None:
+    def get_item(self, custom_id: str) -> Item[V] | None:
         """Get an item from the view with the given custom ID. Alias for `utils.get(view.children, custom_id=custom_id)`.
 
         Parameters
@@ -384,7 +386,7 @@ async def on_check_failure(self, interaction: Interaction) -> None:
             The interaction that occurred.
         """
 
-    async def on_error(self, error: Exception, item: Item, interaction: Interaction) -> None:
+    async def on_error(self, error: Exception, item: Item[V], interaction: Interaction) -> None:
         """|coro|
 
         A callback that is called when an item's callback or :meth:`interaction_check`
@@ -404,7 +406,7 @@ async def on_error(self, error: Exception, item: Item, interaction: Interaction)
         print(f"Ignoring exception in view {self} for item {item}:", file=sys.stderr)
         traceback.print_exception(error.__class__, error, error.__traceback__, file=sys.stderr)
 
-    async def _scheduled_task(self, item: Item, interaction: Interaction):
+    async def _scheduled_task(self, item: Item[V], interaction: Interaction):
         try:
             if self.timeout:
                 self.__timeout_expiry = time.monotonic() + self.timeout
@@ -434,7 +436,7 @@ def _dispatch_timeout(self):
         self.__stopped.set_result(True)
         asyncio.create_task(self.on_timeout(), name=f"discord-ui-view-timeout-{self.id}")
 
-    def _dispatch_item(self, item: Item, interaction: Interaction):
+    def _dispatch_item(self, item: Item[V], interaction: Interaction):
         if self.__stopped.done():
             return
 
@@ -448,12 +450,12 @@ def _dispatch_item(self, item: Item, interaction: Interaction):
 
     def refresh(self, components: list[Component]):
         # This is pretty hacky at the moment
-        old_state: dict[tuple[int, str], Item] = {
+        old_state: dict[tuple[int, str], Item[V]] = {
             (item.type.value, item.custom_id): item
             for item in self.children
             if item.is_dispatchable()  # type: ignore
         }
-        children: list[Item] = [item for item in self.children if not item.is_dispatchable()]
+        children: list[Item[V]] = [item for item in self.children if not item.is_dispatchable()]
         for component in _walk_all_components(components):
             try:
                 older = old_state[(component.type.value, component.custom_id)]  # type: ignore
@@ -515,7 +517,7 @@ async def wait(self) -> bool:
         """
         return await self.__stopped
 
-    def disable_all_items(self, *, exclusions: list[Item] | None = None) -> None:
+    def disable_all_items(self, *, exclusions: list[Item[V]] | None = None) -> None:
         """
         Disables all items in the view.
 
@@ -528,7 +530,7 @@ def disable_all_items(self, *, exclusions: list[Item] | None = None) -> None:
             if exclusions is None or child not in exclusions:
                 child.disabled = True
 
-    def enable_all_items(self, *, exclusions: list[Item] | None = None) -> None:
+    def enable_all_items(self, *, exclusions: list[Item[V]] | None = None) -> None:
         """
         Enables all items in the view.
 
@@ -553,7 +555,7 @@ def message(self, value):
 class ViewStore:
     def __init__(self, state: ConnectionState):
         # (component_type, message_id, custom_id): (View, Item)
-        self._views: dict[tuple[int, int | None, str], tuple[View, Item]] = {}
+        self._views: dict[tuple[int, int | None, str], tuple[View, Item[V]]] = {}
         # message_id: View
         self._synced_message_views: dict[int, View] = {}
         self._state: ConnectionState = state