added alternative options + fixed remove_cog

Author: kvsxxx

README.md

@@ -174,6 +174,37 @@ You can find more (and better) examples [here](https://github.com/discord-py-ui/
 
 # Changelog
 
+-   <details>
+    <summary>4.2.0</summary>
+
+    ## **Added**
+    - cog_remove sync
+    > when you remove a cog the slash commands will now get deleted if you set `delete_unused` to True and set `sync_on_cog` to True
+    - alternativ slash options
+    > you don't have to specify options in one of the slash decorators anymore. Instead, you can set them in your callback function
+    > Example
+    ```py
+    @ui.slash.command()
+    async def greet(ctx, user):                         # This will add an required option with the name "user" of type "user"
+        """Greets a user
+        
+        You can use multiline docstrings, because only the first line will be used for the description
+        """
+        ...
+    
+    @ui.slash.command()
+    async def tag(ctx, target: discord.User = None):    # This will add an optional option with the name "target" of type "user"
+                                                        # Note: you could also use target: "user" = None or anything else you would use in SlashOption for the type
+        ...
+
+    ```
+
+    ## **Fixed**
+    - sync_commands
+    > if you would sync the commands after the first sync, it threw an error
+
+    </details>
+
 -   <details>
     <summary>4.1.4</summary>
 

discord_ui/__init__.py

@@ -44,4 +44,4 @@
 
 
 __title__ = "discord-ui"
-__version__ = "4.1.4"
+__version__ = "4.2.0"

discord_ui/client.py

@@ -298,7 +298,7 @@ async def sync_commands(self, delete_unused=False):
 
 
         #region gather commands
-        commands = self.commands
+        commands = self.commands.copy()
         for _base in self.subcommands:
             # get first base
             for _sub in self.subcommands[_base]:
@@ -340,6 +340,7 @@ async def sync_commands(self, delete_unused=False):
                         commands[_base] = SlashCommand(None, _base, options=[sub.to_dict()], guild_ids=sub.guild_ids, default_permission=sub.default_permission, guild_permissions=sub.guild_permissions)
         #endregion
 
+
         async def guild_stuff(command, guild_ids):
             """Adds the command to the guilds"""
             for x in guild_ids:
@@ -506,8 +507,6 @@ async def add_guild_command(self, base, guild_id):
                 await delete_global_command(self._discord, global_command["id"])
             await create_guild_command(base.to_dict(), self._discord, target_guild, base.permissions.to_dict())
         elif api_command != base:
-            # for some reason, if you sync commands with cogs, it will duplicate the options of a subgroup command
-            # print("api_command", api_command, "\n", "base", base.to_dict())
             await edit_guild_command(api_command["id"], self._discord, target_guild, base.to_dict(), base.permissions.to_dict())
         elif api_permissions != base.permissions:
             await update_command_permissions(self._discord.user.id, self._discord.http.token, guild_id, api_command["id"], base.permissions.to_dict())
@@ -605,7 +604,7 @@ async def edit_command(self, old_name, typ: Literal["slash", 1, "user", 2, "mess
         if name is not None:
             command.name = name
         if description is not None:
-            command.description = _or(description, inspect.getdoc(callback) if callback is not None else None, name, old_name)
+            command.description = _or(description, inspect.getdoc(callback).split("\n")[0] if callback is not None and inspect.getdoc(callback) is not None else None, name, old_name)
         if options is not None:
             command.options = options
         if default_permission is not None:
@@ -683,6 +682,30 @@ def _add_to_cache(self, base: Union[SlashCommand, SlashSubcommand]):
         # context message command
         elif base.command_type == CommandType.Message:
             self.context_commands["message"][base.name] = base
+    def _remove_from_cache(self, base: Union[SlashCommand, SlashSubcommand]):
+        # slash command
+        if base.command_type is CommandType.Slash:
+            # basic slash command
+            if type(base) in [SlashCommand, CogCommand]:
+                del self.commands[base.name]
+            # subcommand or subgroup
+            else:
+                # subgroup
+                if len(base.base_names) > 1:
+                    # remove from internal cache
+                    del self.subcommands[base.base_names[0]][base.base_names[1]][base.name]
+                # subcommand
+                else:
+                    # remove from cache
+                    del self.subcommands[base.base_names[0]][base.name]
+        # context user command
+        elif base.command_type == CommandType.User:
+            # remove from cache
+            del self.context_commands["user"][base.name]
+        # context message command
+        elif base.command_type == CommandType.Message:
+            # remove from cache
+            del self.context_commands["message"][base.name]
 
     async def delete_global_commands(self):
         """**Deletes all global commands**"""
@@ -1048,7 +1071,7 @@ class Components():
 
         ...
         # Your bot declaration should be here
-        components = components(client)
+        components = Components(client)
         
     
     for listening to button presses, use

discord_ui/receive.py

@@ -133,11 +133,6 @@ async def respond(self, content=MISSING, *, tts=False, embed=MISSING, embeds=MIS
         -------
         :return: Returns the sent message
         :type: :class:`~Message` | :class:`EphemeralMessage`
-
-            .. note::
-                
-                If the response is hidden, a EphemeralMessage will be returned, which is an empty class
-
         """
         if ninja_mode is True or all(y in [MISSING, False] for x, y in locals().items() if x not in ["self"]):
             try:
@@ -212,7 +207,7 @@ async def send(self, content=None, *, tts=False, embed=MISSING, embeds=MISSING,
         ----------
         content: :class:`str`, optional
             The raw message content
-        tts: `bool` 
+        tts: :class:`bool` 
             Whether the message should be send with text-to-speech
         embed: :class:`discord.Embed`
             Embed rich content
@@ -239,9 +234,6 @@ async def send(self, content=None, *, tts=False, embed=MISSING, embeds=MISSING,
         -------
         :return: Returns the sent message
         :type: :class:`~Message` | :class:`EphemeralMessage`
-
-            .. note::
-                If the response is hidden, a EphemeralMessage will be returned, which is an empty class
         """
         if self.responded is False:
             return await self.respond(content=content, tts=tts, embed=embed, embeds=embeds, file=file, files=files, nonce=nonce, allowed_mentions=allowed_mentions, mention_author=mention_author, components=components, hidden=hidden)
@@ -536,34 +528,49 @@ async def wait_for(self, event_name: Literal["select", "button"], client, custom
 
         Parameters
         -----------
-        event_name: :class:`str`
-            The name of the event which will be awaited [``"select"`` | ``"button"``] 
-            
-            .. note::
-
-                ``event_name`` must be ``select`` for a select menu selection and ``button`` for a button press
-
-        client: :class:`discord.ext.commands.Bot`
-            The discord client
-        custom_id: :class:`str`, Optional
-            Filters the waiting for a custom_id
-        by: :class:`discord.User` | :class:`discord.Member` | :class:`int` | :class:`str`, Optional
-            The user or the user id by that has to create the component interaction
-        check: :class:`function`, Optional
-            A check that has to return True in order to break from the event and return the received component
-                The function takes the received component as the parameter
-        timeout: :class:`float`, Optional
-            After how many seconds the waiting should be canceled. 
-            Throws an :class:`asyncio.TimeoutError` Exception
+            event_name: :class:`str`
+                The name of the event which will be awaited [``"select"`` | ``"button"``] 
+                
+                .. note::
+
+                    ``event_name`` must be ``select`` for a select menu selection and ``button`` for a button press
+
+            client: :class:`discord.ext.commands.Bot`
+                The discord client
+            custom_id: :class:`str`, Optional
+                Filters the waiting for a custom_id
+            by: :class:`discord.User` | :class:`discord.Member` | :class:`int` | :class:`str`, Optional
+                The user or the user id by that has to create the component interaction
+            check: :class:`function`, Optional
+                A check that has to return True in order to break from the event and return the received component
+                    The function takes the received component as the parameter
+            timeout: :class:`float`, Optional
+                After how many seconds the waiting should be canceled. 
+                Throws an :class:`asyncio.TimeoutError` Exception
 
         Raises
         ------
             :raises: :class:`discord_ui.errors.InvalidEvent` : The event name passed was invalid 
 
         Returns
         ----------
-        :returns: The component that was waited for
-        :type: :class:`~PressedButton` | :class:`~SelectedMenu`
+            :returns: The component that was waited for
+            :type: :class:`~PressedButton` | :class:`~SelectedMenu`
+
+        Example
+        ---------
+
+        .. code-block::
+
+            # send a message with comoponents
+            msg = await ctx.send("okayy", components=[Button("a_custom_id", ...)])
+            try:
+                # wait for the button
+                btn = await msg.wait_for("button", client, "a_custom_id", by=ctx.author, timeout=20)
+                # send response
+                btn.respond()
+            except asyncio.TimeoutError:
+                # no button press was received in 20 seconds timespan
         """
         if event_name.lower() in ["button", "select"]:
             def _check(com):

discord_ui/slash/types.py

@@ -1,3 +1,4 @@
+from discord.enums import InteractionResponseType
 from ..tools import MISSING, _or, _default, _none
 from ..errors import InvalidLength, WrongType
 from .errors import CallbackMissingContextCommandParameters, MissingOptionParameter, NoAsyncCallback, OptionalOptionParameter
@@ -374,7 +375,7 @@ class SlashCommand():
 
 
     """
-    def __init__(self, callback, name=MISSING, description=MISSING, options=[], guild_ids=MISSING, default_permission=MISSING, guild_permissions=MISSING) -> None:
+    def __init__(self, callback, name=MISSING, description=MISSING, options=MISSING, guild_ids=MISSING, default_permission=MISSING, guild_permissions=MISSING) -> None:
         """
         Creates a new base slash command
         
@@ -398,8 +399,9 @@ async def my_function(command, parameter=None):
         }
 
         # Check options before callback because callback makes an option check
-        self.options: typing.List[SlashOption] = options
-
+        if options is MISSING:
+            options = []
+        self.options = options
         if callback is not None:
             if not inspect.iscoroutinefunction(callback):
                 raise NoAsyncCallback()
@@ -412,10 +414,26 @@ async def my_function(command, parameter=None):
                     param = callback_params[op.name]
                     if not op.required and param.default is param.empty:
                         raise OptionalOptionParameter(param.name)
-        
+            if _none(options, empty_array=True):
+                _ops = []
+                has_self = False
+                for _i, _name in enumerate(callback_params):
+                    # ignore context parameter
+                    if _name == "self":
+                        has_self = True
+                        continue
+                    if _i == [0, 1][has_self]:
+                        continue
+                    _val = callback_params.get(_name)
+                    op_type = [_val.annotation, _name][_val.annotation == _val.empty]
+                    if OptionType.any_to_type(op_type) is None:
+                        raise InvalidArgument("Could not find a matching option type for parameter '" + str(op_type) + "'")
+                    _ops.append(SlashOption(op_type, _name, required=_val.default is not None))
+                self.options = _ops
+
         self.callback: function = callback
         self.name = _or(name, self.callback.__name__ if not _none(self.callback) else None)
-        self.description = _or(description, (inspect.getdoc(self.callback) if not _none(self.callback) else None), self.name)
+        self.description = _or(description, inspect.getdoc(callback).split("\n")[0] if not _none(callback) and inspect.getdoc(callback) is not None else None, self.name)
         if default_permission is MISSING:
             default_permission = True
         self.default_permission: bool = default_permission

discord_ui/tools.py

@@ -18,7 +18,7 @@ def get(self, *args):
 MISSING = _MISSING()
 
 def _none(*args, empty_array=False):
-    return all(x in [None, MISSING] + ([[]] if empty_array is True else []) for x in args)
+    return all(x in [None, MISSING] + [[], [[]]][empty_array is True] for x in args)
 def _or(*args, default=None):
     for i in range(len(args)):
         if not _none(args[i]):

docs/source/_static/js/override_page.js

@@ -47,6 +47,8 @@ window.onload = function() {
 
     // async, def, await 
     change_color("k", "#eb52ff")
+    // in keyword
+    change_color("ow", "#eb52ff")
     // function name
     change_color("nf", "#5c9aff")
     // Decorators
@@ -102,5 +104,14 @@ window.onload = function() {
     if (result.length > 0)
         result[0].style["color"] = "white";
 
-    setTimeout(() => document.getElementsByClassName("rst-content")[0].innerHTML += "\n<p style='color: gray;'>Modified by <a href='https://github.com/404kuso' target='_blank'>404kuso</a></p>", 100)
+    // remove the discord_ui. ... prefix
+    result = document.getElementsByClassName("reference internal")
+    for(let i = 0; i < result.length; i++) {
+        if (result[i].text != null && result[i].text.match("discord_ui\.[\w]*\.")) 
+            result[i].text = (result[i].text.split(".").at(-1))
+    }
+
+    // Add author
+    document.getElementsByClassName("rst-content")[0].innerHTML += "\n<p style='color: gray;'>Modified by <a href='https://github.com/404kuso' target='_blank'>404kuso</a></p>"
+
 }