ext.bridge improvements (#1496)

Co-Authored-By: Dorukyum <[email protected]>
Co-Authored-By: Emre Terzioglu <[email protected]>
Co-authored-by: Lala Sabathil <[email protected]>
Co-authored-by: BobDotCom <[email protected]>

Author: 5 people

discord/commands/core.py

@@ -619,7 +619,7 @@ def __new__(cls, *args, **kwargs) -> SlashCommand:
         self.__original_kwargs__ = kwargs.copy()
         return self
 
-    def __init__(self, func: Callable, **kwargs) -> None:
+    def __init__(self, func: Callable, *args, **kwargs) -> None:
         super().__init__(func, **kwargs)
         if not asyncio.iscoroutinefunction(func):
             raise TypeError("Callback must be a coroutine.")
@@ -1016,10 +1016,10 @@ def __init__(
         parent: Optional[SlashCommandGroup] = None,
         **kwargs,
     ) -> None:
-        self.name = name
-        self.description = description or "No description provided"
-        validate_chat_input_name(self.name)
-        validate_chat_input_description(self.description)
+        validate_chat_input_name(name)
+        validate_chat_input_description(description)
+        self.name = str(name)
+        self.description = description
         self.input_type = SlashCommandOptionType.sub_command_group
         self.subcommands: List[Union[SlashCommand, SlashCommandGroup]] = self.__initial_commands__
         self.guild_ids = guild_ids
@@ -1065,9 +1065,9 @@ def to_dict(self) -> Dict:
 
         return as_dict
 
-    def command(self, **kwargs) -> Callable[[Callable], SlashCommand]:
-        def wrap(func) -> SlashCommand:
-            command = SlashCommand(func, parent=self, **kwargs)
+    def command(self, cls: Type[T] = SlashCommand, **kwargs) -> Callable[[Callable], SlashCommand]:
+        def wrap(func) -> T:
+            command = cls(func, parent=self, **kwargs)
             self.subcommands.append(command)
             return command
 

discord/ext/bridge/bot.py

@@ -30,7 +30,7 @@
 from ..commands import AutoShardedBot as ExtAutoShardedBot
 from ..commands import Bot as ExtBot
 from .context import BridgeApplicationContext, BridgeExtContext
-from .core import BridgeCommand, bridge_command
+from .core import BridgeCommand, BridgeCommandGroup, bridge_command, bridge_group
 
 __all__ = ("Bot", "AutoShardedBot")
 
@@ -75,6 +75,22 @@ def decorator(func) -> BridgeCommand:
 
         return decorator
 
+    def bridge_group(self, **kwargs):
+        """A decorator that is used to wrap a function as a bridge command group.
+
+        Parameters
+        ----------
+        kwargs: Optional[Dict[:class:`str`, Any]]
+            Keyword arguments that are directly passed to the respective command constructors. (:class:`.SlashCommandGroup` and :class:`.ext.commands.Group`)
+        """
+
+        def decorator(func) -> BridgeCommandGroup:
+            result = bridge_group(**kwargs)(func)
+            self.add_bridge_command(result)
+            return result
+
+        return decorator
+
 
 class Bot(BotBase, ExtBot):
     """Represents a discord bot, with support for cross-compatibility between command types.

discord/ext/bridge/context.py

@@ -50,10 +50,10 @@ class BridgeContext(ABC):
 
         @bot.bridge_command()
         async def example(ctx: BridgeContext):
-            if isinstance(ctx, BridgeExtContext):
-                command_type = "Traditional (prefix-based) command"
-            elif isinstance(ctx, BridgeApplicationContext):
+            if ctx.is_app:
                 command_type = "Application command"
+            else:
+                command_type = "Traditional (prefix-based) command"
             await ctx.send(f"This command was invoked with a(n) {command_type}.")
 
     .. versionadded:: 2.0
@@ -118,6 +118,11 @@ async def edit(self, *args, **kwargs) -> Union[InteractionMessage, Message]:
     def _get_super(self, attr: str) -> Any:
         return getattr(super(), attr)
 
+    @property
+    def is_app(self) -> bool:
+        """bool: Whether the context is an :class:`BridgeApplicationContext` or not."""
+        return isinstance(self, BridgeApplicationContext)
+
 
 class BridgeApplicationContext(BridgeContext, ApplicationContext):
     """