Merge branch 'master' into get_or_fetch

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/github-action@v2.7.1
+        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.1
+        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 }}

CHANGELOG.md

@@ -51,12 +51,16 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
 - Added `Message.forward_to`, `Message.snapshots`, and other related attributes.
   ([#2598](https://github.com/Pycord-Development/pycord/pull/2598))
+- 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`.
   ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
 - Added `Guild.get_or_fetch()` and `Client.get_or_fetch()` shortcut methods.
   ([#2776](https://github.com/Pycord-Development/pycord/pull/2776))
+- 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))
 
@@ -121,6 +125,12 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#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
 
@@ -140,6 +150,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#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
 

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/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/commands/options.py

@@ -225,7 +225,9 @@ def __init__(
         self.description = description or "No description provided"
         self.channel_types: list[ChannelType] = kwargs.pop("channel_types", [])
 
-        if isinstance(input_type, SlashCommandOptionType):
+        if self.channel_types:
+            self.input_type = SlashCommandOptionType.channel
+        elif isinstance(input_type, SlashCommandOptionType):
             self.input_type = input_type
         else:
             from ..ext.commands import Converter

discord/ext/bridge/core.py

@@ -51,6 +51,7 @@
     Converter,
     Group,
     GuildChannelConverter,
+    MemberConverter,
     RoleConverter,
     UserConverter,
 )
@@ -566,13 +567,21 @@ def predicate(func: Callable | ApplicationCommand):
 
 
 class MentionableConverter(Converter):
-    """A converter that can convert a mention to a user or a role."""
+    """A converter that can convert a mention to a member, a user or a role."""
 
     async def convert(self, ctx, argument):
         try:
             return await RoleConverter().convert(ctx, argument)
         except BadArgument:
-            return await UserConverter().convert(ctx, argument)
+            pass
+
+        if ctx.guild:
+            try:
+                return await MemberConverter().convert(ctx, argument)
+            except BadArgument:
+                pass
+
+        return await UserConverter().convert(ctx, argument)
 
 
 class AttachmentConverter(Converter):
@@ -600,6 +609,7 @@ async def convert(self, ctx, arg: bool):
     SlashCommandOptionType.mentionable: MentionableConverter,
     SlashCommandOptionType.number: float,
     SlashCommandOptionType.attachment: AttachmentConverter,
+    discord.Member: MemberConverter,
 }
 
 
@@ -608,16 +618,24 @@ class BridgeOption(Option, Converter):
     command option and a prefixed command argument for bridge commands.
     """
 
+    def __init__(self, input_type, *args, **kwargs):
+        self.converter = kwargs.pop("converter", None)
+        super().__init__(input_type, *args, **kwargs)
+
+        self.converter = self.converter or BRIDGE_CONVERTER_MAPPING.get(input_type)
+
     async def convert(self, ctx, argument: str) -> Any:
         try:
             if self.converter is not None:
-                converted = await self.converter.convert(ctx, argument)
+                converted = await self.converter().convert(ctx, argument)
             else:
-                converter = BRIDGE_CONVERTER_MAPPING[self.input_type]
-                if issubclass(converter, Converter):
+                converter = BRIDGE_CONVERTER_MAPPING.get(self.input_type)
+                if isinstance(converter, type) and issubclass(converter, Converter):
                     converted = await converter().convert(ctx, argument)  # type: ignore # protocol class
-                else:
+                elif callable(converter):
                     converted = converter(argument)
+                else:
+                    raise TypeError(f"Invalid converter: {converter}")
 
             if self.choices:
                 choices_names: list[str | int | float] = [

discord/gateway.py

@@ -35,6 +35,7 @@
 import traceback
 import zlib
 from collections import deque, namedtuple
+from typing import TYPE_CHECKING
 
 import aiohttp
 
@@ -208,6 +209,9 @@ def ack(self):
 
 
 class VoiceKeepAliveHandler(KeepAliveHandler):
+    if TYPE_CHECKING:
+        ws: DiscordVoiceWebSocket
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.recent_ack_latencies = deque(maxlen=20)
@@ -216,7 +220,10 @@ def __init__(self, *args, **kwargs):
         self.behind_msg = "High socket latency, shard ID %s heartbeat is %.1fs behind"
 
     def get_payload(self):
-        return {"op": self.ws.HEARTBEAT, "d": int(time.time() * 1000)}
+        return {
+            "op": self.ws.HEARTBEAT,
+            "d": {"t": int(time.time() * 1000), "seq_ack": self.ws.seq_ack},
+        }
 
     def ack(self):
         ack_time = time.perf_counter()
@@ -784,6 +791,7 @@ def __init__(self, socket, loop, *, hook=None):
         self._close_code = None
         self.secret_key = None
         self.ssrc_map = {}
+        self.seq_ack: int = -1
         if hook:
             self._hook = hook
 
@@ -804,6 +812,9 @@ async def resume(self):
                 "token": state.token,
                 "server_id": str(state.server_id),
                 "session_id": state.session_id,
+                # this seq_ack will allow for us to do buffered resume, which is, receive the
+                # lost voice packets while trying to resume the reconnection
+                "seq_ack": self.seq_ack,
             },
         }
         await self.send_as_json(payload)
@@ -824,7 +835,7 @@ async def identify(self):
     @classmethod
     async def from_client(cls, client, *, resume=False, hook=None):
         """Creates a voice websocket for the :class:`VoiceClient`."""
-        gateway = f"wss://{client.endpoint}/?v=4"
+        gateway = f"wss://{client.endpoint}/?v=8"
         http = client._state.http
         socket = await http.ws_connect(gateway, compress=15)
         ws = cls(socket, loop=client.loop, hook=hook)
@@ -860,14 +871,21 @@ async def client_connect(self):
         await self.send_as_json(payload)
 
     async def speak(self, state=SpeakingState.voice):
-        payload = {"op": self.SPEAKING, "d": {"speaking": int(state), "delay": 0}}
+        payload = {
+            "op": self.SPEAKING,
+            "d": {
+                "speaking": int(state),
+                "delay": 0,
+            },
+        }
 
         await self.send_as_json(payload)
 
     async def received_message(self, msg):
         _log.debug("Voice websocket frame received: %s", msg)
         op = msg["op"]
         data = msg.get("d")
+        self.seq_ack = data.get("seq", self.seq_ack)
 
         if op == self.READY:
             await self.initial_connection(data)

discord/guild.py

@@ -1703,6 +1703,9 @@ async def edit(
         public_updates_channel: TextChannel | None = MISSING,
         premium_progress_bar_enabled: bool = MISSING,
         disable_invites: bool = MISSING,
+        discoverable: bool = MISSING,
+        disable_raid_alerts: bool = MISSING,
+        enable_activity_feed: bool = MISSING,
     ) -> Guild:
         r"""|coro|
 
@@ -1780,6 +1783,12 @@ async def edit(
             Whether the guild should have premium progress bar enabled.
         disable_invites: :class:`bool`
             Whether the guild should have server invites enabled or disabled.
+        discoverable: :class:`bool`
+            Whether the guild should be discoverable in the discover tab.
+        disable_raid_alerts: :class:`bool`
+            Whether activity alerts for the guild should be disabled.
+        enable_activity_feed: class:`bool`
+            Whether the guild's user activity feed should be enabled.
         reason: Optional[:class:`str`]
             The reason for editing this guild. Shows up on the audit log.
 
@@ -1901,8 +1910,12 @@ async def edit(
 
             fields["system_channel_flags"] = system_channel_flags.value
 
+        if premium_progress_bar_enabled is not MISSING:
+            fields["premium_progress_bar_enabled"] = premium_progress_bar_enabled
+
+        features: list[GuildFeature] = self.features.copy()
+
         if community is not MISSING:
-            features = self.features.copy()
             if community:
                 if (
                     "rules_channel_id" in fields
@@ -1912,8 +1925,7 @@ async def edit(
                         features.append("COMMUNITY")
                 else:
                     raise InvalidArgument(
-                        "community field requires both rules_channel and"
-                        " public_updates_channel fields to be provided"
+                        "community field requires both rules_channel and public_updates_channel fields to be provided"
                     )
             else:
                 if "COMMUNITY" in features:
@@ -1923,20 +1935,43 @@ async def edit(
                         fields["public_updates_channel_id"] = None
                     features.remove("COMMUNITY")
 
-            fields["features"] = features
-
-        if premium_progress_bar_enabled is not MISSING:
-            fields["premium_progress_bar_enabled"] = premium_progress_bar_enabled
-
         if disable_invites is not MISSING:
-            features = self.features.copy()
             if disable_invites:
-                if not "INVITES_DISABLED" in features:
+                if "INVITES_DISABLED" not in features:
                     features.append("INVITES_DISABLED")
             else:
                 if "INVITES_DISABLED" in features:
                     features.remove("INVITES_DISABLED")
 
+        if discoverable is not MISSING:
+            if discoverable:
+                if "DISCOVERABLE" not in features:
+                    features.append("DISCOVERABLE")
+            else:
+                if "DISCOVERABLE" in features:
+                    features.remove("DISCOVERABLE")
+
+        if disable_raid_alerts is not MISSING:
+            if disable_raid_alerts:
+                if "RAID_ALERTS_DISABLED" not in features:
+                    features.append("RAID_ALERTS_DISABLED")
+            else:
+                if "RAID_ALERTS_DISABLED" in features:
+                    features.remove("RAID_ALERTS_DISABLED")
+
+        if enable_activity_feed is not MISSING:
+            if enable_activity_feed:
+                if "ACTIVITY_FEED_ENABLED_BY_USER" not in features:
+                    features.append("ACTIVITY_FEED_ENABLED_BY_USER")
+                if "ACTIVITY_FEED_DISABLED_BY_USER" in features:
+                    features.remove("ACTIVITY_FEED_DISABLED_BY_USER")
+            else:
+                if "ACTIVITY_FEED_ENABLED_BY_USER" in features:
+                    features.remove("ACTIVITY_FEED_ENABLED_BY_USER")
+                if "ACTIVITY_FEED_DISABLED_BY_USER" not in features:
+                    features.append("ACTIVITY_FEED_DISABLED_BY_USER")
+
+        if self.features != features:
             fields["features"] = features
 
         data = await http.edit_guild(self.id, reason=reason, **fields)