Merge branch 'master' into soundboard-permissions

Author: plun1331

CHANGELOG.md

@@ -52,6 +52,10 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2595](https://github.com/Pycord-Development/pycord/pull/2595))
 - Fixed `BucketType.category` cooldown commands not functioning correctly in private
   channels. ([#2603](https://github.com/Pycord-Development/pycord/pull/2603))
+- Fixed `SlashCommand`'s `ctx` parameter couldn't be `Union` type.
+  ([#2611](https://github.com/Pycord-Development/pycord/pull/2611))
+- Fixed `TypeError` when passing `skus` parameter in `Client.entitlements()`.
+  ([#2627](https://github.com/Pycord-Development/pycord/issues/2627))
 
 ### Changed
 

discord/commands/options.py

@@ -39,6 +39,7 @@
     Thread,
     VoiceChannel,
 )
+from ..commands import ApplicationContext
 from ..enums import ChannelType
 from ..enums import Enum as DiscordEnum
 from ..enums import SlashCommandOptionType
@@ -227,6 +228,13 @@ def __init__(
         else:
             from ..ext.commands import Converter
 
+            if isinstance(input_type, tuple) and any(
+                issubclass(op, ApplicationContext) for op in input_type
+            ):
+                input_type = next(
+                    op for op in input_type if issubclass(op, ApplicationContext)
+                )
+
             if (
                 isinstance(input_type, Converter)
                 or input_type_is_class

discord/http.py

@@ -3012,7 +3012,7 @@ def list_entitlements(
         if user_id is not None:
             params["user_id"] = user_id
         if sku_ids is not None:
-            params["sku_ids"] = ",".join(sku_ids)
+            params["sku_ids"] = ",".join(str(sku_id) for sku_id in sku_ids)
         if before is not None:
             params["before"] = before
         if after is not None:

docs/ext/bridge/api.rst

@@ -158,11 +158,16 @@ BridgeContext Subclasses
 
     Alias of :data:`typing.Union` [ :class:`.BridgeExtContext`, :class:`.BridgeApplicationContext` ] for typing convenience.
 
-Option
+Options
 ------
 
-BridgeOption
-~~~~~~~~~~~~
+Shortcut Decorators
+~~~~~~~~~~~~~~~~~~~
+.. autofunction:: discord.ext.bridge.bridge_option
+    :decorator:
+
+Objects
+~~~~~~~
 
 .. attributetable:: discord.ext.bridge.BridgeOption