fixed global command adding

Author: kuso-senpai

README.md

@@ -172,6 +172,22 @@ You can find more (and better) examples [here](https://github.com/discord-py-ui/
 
 # Changelog
 
+-   <details>
+    <summary>4.1.1</summary>
+
+    ## **Fixed**
+    - Interaction.author.voice
+    > For some reason the voice property of the creator or the interaction would be set
+
+    - Global slashcommands
+    > They wouldn't be registered to the api
+
+    - Subcommands editing
+    * not fixed yet
+    > subcommand checks were wrong and this would result in errors like `In options.0.options.2: Option name 'name' is already used in these options`
+
+    </details>
+
 -   <details>
     <summary>4.1.0</summary>
 

discord_ui/client.py

@@ -164,10 +164,7 @@ async def _on_response(self, msg):
         if int(data["type"]) not in [1, 2]:
             return
 
-        guild = None
-        if data.get("guild_id") is not None:
-            self._discord._connection._get_guild(int(data["guild_id"]))
-        user = discord.Member(data=data["member"], guild=guild, state=self._discord._connection) if data.get("member") is not None else discord.User(state=self._discord._connection, data=data["user"])
+        user = discord.Member(data=data["member"], guild=self._discord._connection._get_guild(int(data["guild_id"])), state=self._discord._connection) if data.get("member") is not None else discord.User(state=self._discord._connection, data=data["user"])
 
         interaction = Interaction(self._discord._connection, data, user)
         if self.auto_defer[0] is True:
@@ -377,17 +374,17 @@ async def add_command(command):
                 for guild in list(command.guild_permissions.keys()):
                     await self.update_permissions(command.name, command.type, guild_id=guild, permissions=command.guild_permissions[guild], global_command=True)
             # global command
-            else:
+            elif command.guild_ids is MISSING and command.guild_permissions is MISSING:
                 logging.debug("adding '" + str(command.name) + "' as global command")
                 await global_stuff(command)
-        
+
         for x in commands:
             await add_command(commands[x])
 
         for x in self.context_commands:
             for com in self.context_commands[x]:
                 await add_command(self.context_commands[x][com])
-        
+
         if delete_unused:
             api_coms = await self._get_global_commands()
             for apic in api_coms:
@@ -509,6 +506,7 @@ 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:
+            # 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())
@@ -1144,10 +1142,7 @@ async def _on_response(self, msg):
         if data["type"] != 3:
             return
 
-        guild = None
-        if data.get("guild_id") is not None:
-            guild = cache_data(data["guild_id"], AdditionalType.GUILD, data, self._discord._connection)
-        user = discord.Member(data=data["member"], guild=guild, state=self._discord._connection) if data.get("member") is not None else discord.User(state=self._discord._connection, data=data["user"])
+        user = discord.Member(data=data["member"], guild=self._discord._connection._get_guild(int(data["guild_id"])), state=self._discord._connection) if data.get("member") is not None else discord.User(state=self._discord._connection, data=data["user"])
         msg = await getMessage(self._discord._connection, data=data, response=True)
 
         interaction = Interaction(self._discord._connection, data, user, msg)

discord_ui/receive.py

@@ -1,7 +1,7 @@
 from .errors import InvalidEvent, OutOfValidRange, WrongType
 from .slash.errors import AlreadyDeferred, EphemeralDeletion
 from .slash.types import ContextCommand, SlashCommand, SlashPermission, SlashSubcommand
-from .tools import MISSING, setup_logger
+from .tools import MISSING, setup_logger, _none
 from .http import BetterRoute, jsonifyMessage, send_files
 from .components import ActionRow, Button, LinkButton, SelectMenu, SelectOption, make_component
 
@@ -303,7 +303,7 @@ def __init__(self, client, command: SlashCommand, data, user, args = None, guild
         self.bot: Bot = client
         self._json = command.to_dict()
         self.author: discord.Member = user
-        """The channel where the slash command was used"""
+        """The user who used the command"""
         self.guild_ids = guild_ids
         """The ids of the guilds where the command is available"""
         self.args: Dict[str, Union[str, int, bool, discord.Member, discord.TextChannel, discord.Role, float]] = args
@@ -569,11 +569,11 @@ async def wait_for(self, event_name: Literal["select", "button"], client, custom
             def _check(com):
                 if com.message.id == self.id:
                     statements = []
-                    if custom_id not in [MISSING, None]:
+                    if not _none(custom_id):
                         statements.append(com.custom_id == custom_id)
-                    if by not in [MISSING, None]:
+                    if not _none(by):
                         statements.append(com.member.id == (by.id if hasattr(by, "id") else int(by)))
-                    if check not in [MISSING, None]:
+                    if not _none(check):
                         statements.append(check(com))
                     return all(statements)
                 return False

discord_ui/slash/types.py

@@ -1,4 +1,4 @@
-from ..tools import MISSING, _or
+from ..tools import MISSING, _or, _default, _none
 from ..errors import InvalidLength, WrongType
 from .errors import CallbackMissingContextCommandParameters, MissingOptionParameter, NoAsyncCallback, OptionalOptionParameter
 
@@ -414,21 +414,21 @@ async def my_function(command, parameter=None):
                         raise OptionalOptionParameter(param.name)
 
         self.callback: function = callback
-        self.name = _or(name, self.callback.__name__ if self.callback not in [None, MISSING] else None)
-        self.description = _or(description, (inspect.getdoc(self.callback) if self.callback not in [None, MISSING] else None), self.name)
+        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)
         if default_permission is MISSING:
             default_permission = True
         self.default_permission: bool = default_permission
-        if guild_permissions not in [MISSING, None]:
+        if not _none(guild_permissions):
             for _id, perm in list(guild_permissions.items()):
                 if type(_id) not in [str, int, discord.User, discord.Member, discord.Role]:
                     raise WrongType("guild_permissions key " + str(_id), _id, ["str", "int", "discord.User", "discord.Member", "discord.Role"])
                 if type(perm) is not SlashPermission:
                     raise WrongType("guild_permission[" + ("'" if type(_id) is str else "") + str(_id) + ("'" if type(_id) is str else "") + "]", perm, "SlashPermission")
 
-        self.guild_permissions: typing.Dict[(typing.Union[str, int], SlashPermission)] = guild_permissions or MISSING
+        self.guild_permissions: typing.Dict[(typing.Union[str, int], SlashPermission)] = _default(MISSING, guild_permissions)
         self.permissions: SlashPermission = SlashPermission()
-        self.guild_ids: typing.List[int] = [int(x) for x in _or(guild_ids, [])]
+        self.guild_ids: typing.List[int] = _default(MISSING, [int(x) for x in _or(guild_ids, [])])
 
     def __str__(self) -> str:
         return str(self.to_dict())
@@ -469,7 +469,7 @@ def name(self) -> str:
         return self._json["name"]
     @name.setter
     def name(self, value):
-        if value in [None, MISSING]:
+        if _none(value):
             raise InvalidArgument("You have to specify a name")
         if type(value) is not str:
             raise WrongType("name", value, "str")

discord_ui/tools.py

@@ -17,11 +17,20 @@ 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)
 def _or(*args, default=None):
     for i in range(len(args)):
-        if args[i] not in [MISSING, None]:
+        if not _none(args[i]):
             return args[i]
     return default
+def _default(default, *args, empty_array=True):
+    if _none(*args, empty_array=empty_array):
+        return default
+    if len(args) == 1:
+        return args[0]
+    return args
+
 
 def get_index(l: list, elem: Any, mapping = lambda x: x, default: int = -1) -> int:
     """Returns the index of an element in the list