Merge branch 'master' into partial-autocomplete

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

Author: Paillat-dev

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

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/github-action@v2.7.0
+        uses: crowdin/github-action@v2.9.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/github-action@v2.7.0
+        uses: crowdin/github-action@v2.9.1
         with:
           upload_sources: true
           upload_translations: false

.github/workflows/todo-checks.yml

@@ -23,7 +23,7 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@v4
       - name: "Track TODO Action"
-        uses: ribtoks/[email protected].14-beta
+        uses: ribtoks/[email protected].15-beta
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}

.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)$
@@ -87,7 +87,7 @@ repos:
         args: [--prose-wrap=always, --print-width=88]
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/DanielNoord/pydocstringformatter
-    rev: v0.7.3
+    rev: v0.7.5
     hooks:
       - id: pydocstringformatter
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -54,10 +54,18 @@ These changes are available on the `master` branch, but have not yet been releas
 - Added the ability to use functions with any number of optional arguments and functions
   returning an awaitable as `Option.autocomplete`.
   ([#2669](https://github.com/Pycord-Development/pycord/pull/2669))
+- Add missing `Guild` feature flags and `Guild.edit` parameters.
+  ([#2672](https://github.com/Pycord-Development/pycord/pull/2672))
 - 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 type hinting slash command options with `typing.Annotated`.
+  ([#2782](https://github.com/Pycord-Development/pycord/pull/2782))
+- Added conversion to `Member` in `MentionableConverter`.
+  ([#2775](https://github.com/Pycord-Development/pycord/pull/2775))
+- Added `discord.Interaction.created_at`.
+  ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 
 ### Fixed
 
@@ -108,12 +116,24 @@ 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))
+- Fixed `VoiceClient.connect` failing to do initial connection.
+  ([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
+- Fixed `AttributeError` when printing a File component's `__repr__`.
+  ([#2843](https://github.com/Pycord-Development/pycord/pull/2843))
+- Fixed `TypeError` when using `@option` with certain annotations and along with
+  `channel_types`. ([#2835](https://github.com/Pycord-Development/pycord/pull/2835))
 
 ### Changed
 
@@ -131,6 +151,10 @@ 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))
+- Upgraded voice websocket version to v8.
+  ([#2812](https://github.com/Pycord-Development/pycord/pull/2812))
 
 ### Deprecated
 
@@ -141,6 +165,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

crowdin.yml

@@ -5,7 +5,7 @@ preserve_hierarchy: true
 
 commit_message: "docs: Update translations"
 
-export_languages: ["de", "ja", "fr", "it", "hi", "ko", "pt-BR", "es-ES", "zh-CN"]
+export_languages: ["de", "ja", "fr", "it", "hi", "ko", "pt-BR", "es-ES", "zh-CN", "tr"]
 
 bundles:
   - 1

discord/abc.py

@@ -1615,6 +1615,12 @@ async def send(
                 )
 
             components = view.to_components()
+            if view.is_components_v2():
+                if embeds or content:
+                    raise TypeError(
+                        "cannot send embeds or content with a view using v2 component logic"
+                    )
+                flags.is_components_v2 = True
         else:
             components = None
 
@@ -1679,8 +1685,10 @@ async def send(
 
         ret = state.create_message(channel=channel, data=data)
         if view:
-            state.store_view(view, ret.id)
+            if view.is_dispatchable():
+                state.store_view(view, ret.id)
             view.message = ret
+            view.refresh(ret.components)
 
         if delete_after is not None:
             await ret.delete(delay=delete_after)

discord/asset.py

@@ -144,7 +144,9 @@ class Asset(AssetMixin):
 
         .. describe:: hash(x)
 
-            Returns the hash of the asset.
+            Returns the asset's url's hash.
+
+            This is equivalent to hash(:attr:`url`).
     """
 
     __slots__: tuple[str, ...] = (

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
@@ -879,15 +884,15 @@ async def process_application_commands(
 
         ctx = await self.get_application_context(interaction)
         if command:
-            ctx.command = command
+            interaction.command = command
         await self.invoke_application_command(ctx)
 
     async def on_application_command_auto_complete(
         self, interaction: Interaction, command: ApplicationCommand
     ) -> None:
         async def callback() -> None:
             ctx = await self.get_autocomplete_context(interaction)
-            ctx.command = command
+            interaction.command = command
             return await command.invoke_autocomplete_callback(ctx)
 
         autocomplete_task = self._bot.loop.create_task(callback())

discord/channel.py

@@ -26,7 +26,16 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Mapping, TypeVar, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Iterable,
+    Mapping,
+    Sequence,
+    TypeVar,
+    overload,
+)
 
 import discord.abc
 
@@ -45,7 +54,7 @@
 )
 from .errors import ClientException, InvalidArgument
 from .file import File
-from .flags import ChannelFlags
+from .flags import ChannelFlags, MessageFlags
 from .invite import Invite
 from .iterators import ArchivedThreadIterator
 from .mixins import Hashable
@@ -71,12 +80,15 @@
 
 if TYPE_CHECKING:
     from .abc import Snowflake, SnowflakeTime
+    from .embeds import Embed
     from .guild import Guild
     from .guild import GuildChannel as GuildChannelType
     from .member import Member, VoiceState
+    from .mentions import AllowedMentions
     from .message import EmojiInputType, Message, PartialMessage
     from .role import Role
     from .state import ConnectionState
+    from .sticker import GuildSticker, StickerItem
     from .types.channel import CategoryChannel as CategoryChannelPayload
     from .types.channel import DMChannel as DMChannelPayload
     from .types.channel import ForumChannel as ForumChannelPayload
@@ -87,6 +99,7 @@
     from .types.channel import VoiceChannel as VoiceChannelPayload
     from .types.snowflake import SnowflakeList
     from .types.threads import ThreadArchiveDuration
+    from .ui.view import View
     from .user import BaseUser, ClientUser, User
     from .webhook import Webhook
 
@@ -1181,18 +1194,20 @@ async def edit(self, *, reason=None, **options):
     async def create_thread(
         self,
         name: str,
-        content=None,
+        content: str | None = None,
         *,
-        embed=None,
-        embeds=None,
-        file=None,
-        files=None,
-        stickers=None,
-        delete_message_after=None,
-        nonce=None,
-        allowed_mentions=None,
-        view=None,
-        applied_tags=None,
+        embed: Embed | None = None,
+        embeds: list[Embed] | None = None,
+        file: File | None = None,
+        files: list[File] | None = None,
+        stickers: Sequence[GuildSticker | StickerItem] | None = None,
+        delete_message_after: float | None = None,
+        nonce: int | str | None = None,
+        allowed_mentions: AllowedMentions | None = None,
+        view: View | None = None,
+        applied_tags: list[ForumTag] | None = None,
+        suppress: bool = False,
+        silent: bool = False,
         auto_archive_duration: ThreadArchiveDuration = MISSING,
         slowmode_delay: int = MISSING,
         reason: str | None = None,
@@ -1292,13 +1307,24 @@ async def create_thread(
         else:
             allowed_mentions = allowed_mentions.to_dict()
 
+        flags = MessageFlags(
+            suppress_embeds=bool(suppress),
+            suppress_notifications=bool(silent),
+        )
+
         if view:
             if not hasattr(view, "__discord_ui_view__"):
                 raise InvalidArgument(
                     f"view parameter must be View not {view.__class__!r}"
                 )
 
             components = view.to_components()
+            if view.is_components_v2():
+                if embeds or content:
+                    raise TypeError(
+                        "cannot send embeds or content with a view using v2 component logic"
+                    )
+                flags.is_components_v2 = True
         else:
             components = None
 
@@ -1337,6 +1363,7 @@ async def create_thread(
                 or self.default_auto_archive_duration,
                 rate_limit_per_user=slowmode_delay or self.slowmode_delay,
                 applied_tags=applied_tags,
+                flags=flags.value,
                 reason=reason,
             )
         finally:
@@ -1346,7 +1373,7 @@ async def create_thread(
 
         ret = Thread(guild=self.guild, state=self._state, data=data)
         msg = ret.get_partial_message(int(data["last_message_id"]))
-        if view:
+        if view and view.is_dispatchable():
             state.store_view(view, msg.id)
 
         if delete_message_after is not None: