fix(channel, sync): Prevent bot from crashing if it is invited without application.commands scope; allow modifying channels outside of a category

interactions/api/models/channel.py

@@ -181,7 +181,10 @@ def __init__(self, **kwargs):
             else None
         )
         self.permission_overwrites = (
-            [Overwrite(**overwrite) for overwrite in self._json.get("permission_overwrites")]
+            [
+                Overwrite(**overwrite) if isinstance(overwrite, dict) else overwrite
+                for overwrite in self._json.get("permission_overwrites")
+            ]
             if self._json.get("permission_overwrites")
             else None
         )
@@ -349,10 +352,14 @@ async def modify(
             self.rate_limit_per_user if rate_limit_per_user is MISSING else rate_limit_per_user
         )
         _position = self.position if position is MISSING else position
-        _parent_id = int(self.parent_id) if parent_id is MISSING else int(parent_id)
+        _parent_id = (
+            (int(self.parent_id) if self.parent_id else None)
+            if parent_id is MISSING
+            else int(parent_id)
+        )
         _nsfw = self.nsfw if nsfw is MISSING else nsfw
         _permission_overwrites = (
-            self.permission_overwrites
+            [_._json for _ in self.permission_overwrites]
             if permission_overwrites is MISSING
             else [overwrite._json for overwrite in permission_overwrites]
         )

interactions/api/models/guild.py

@@ -834,10 +834,12 @@ async def modify_channel(
             ch.rate_limit_per_user if rate_limit_per_user is MISSING else rate_limit_per_user
         )
         _position = ch.position if position is MISSING else position
-        _parent_id = ch.parent_id if parent_id is MISSING else parent_id
+        _parent_id = (
+            (int(ch.parent_id) if ch.parent_id else None) if parent_id is MISSING else parent_id
+        )
         _nsfw = ch.nsfw if nsfw is MISSING else nsfw
         _permission_overwrites = (
-            ch.permission_overwrites
+            [_._json for _ in ch.permission_overwrites]
             if permission_overwrites is MISSING
             else [overwrite._json for overwrite in permission_overwrites]
         )

interactions/client/bot.py

@@ -155,6 +155,7 @@ async def __compare_sync(
         """
 
         # sourcery skip: none-compare
+
         attrs: List[str] = [
             name
             for name in ApplicationCommand.__slots__
@@ -170,6 +171,78 @@ async def __compare_sync(
 
         _command: dict = {}
 
+        def __check_options(command, data):
+            # sourcery skip: none-compare
+            # sourcery no-metrics
+            _command_option_names = [_["name"] for _ in command.get("options")]
+            _data_option_names = [_["name"] for _ in data.get("options")]
+
+            if any(_ not in _command_option_names for _ in _data_option_names) or len(
+                _data_option_names
+            ) != len(_command_option_names):
+                return False, command
+
+            for option in command.get("options"):
+                for _option in data.get("options"):
+                    if _option["name"] == option["name"]:
+                        for option_attr in option_attrs:
+                            if (
+                                option.get(option_attr)
+                                and not _option.get(option_attr)
+                                or not option.get(option_attr)
+                                and _option.get(option_attr)
+                            ):
+                                return False, command
+                            elif option_attr == "choices":
+                                if not option.get("choices") or not _option.get("choices"):
+                                    continue
+
+                                _option_choice_names = [_["name"] for _ in option.get("choices")]
+                                _data_choice_names = [_["name"] for _ in _option.get("choices")]
+
+                                if any(
+                                    _ not in _option_choice_names for _ in _data_choice_names
+                                ) or len(_data_choice_names) != len(_option_choice_names):
+                                    return False, command
+
+                                for choice in option.get("choices"):
+                                    for _choice in _option.get("choices"):
+                                        if choice["name"] == _choice["name"]:
+                                            for choice_attr in choice_attrs:
+                                                if (
+                                                    choice.get(choice_attr)
+                                                    and not _choice.get(choice_attr)
+                                                    or not choice.get(choice_attr)
+                                                    and _choice.get(choice_attr)
+                                                ):
+                                                    return False, command
+                                                elif choice.get(choice_attr) != _choice.get(
+                                                    choice_attr
+                                                ):
+                                                    return False, command
+                                                else:
+                                                    continue
+                            elif option_attr == "required":
+                                if (
+                                    option.get(option_attr) == None  # noqa: E711
+                                    and _option.get(option_attr) == False  # noqa: E712
+                                ):
+                                    # API not including if False
+                                    continue
+
+                            elif option_attr == "options":
+                                if not option.get(option_attr) and not _option.get("options"):
+                                    continue
+                                _clean, _command = __check_options(option, _option)
+                                if not _clean:
+                                    return _clean, _command
+
+                            elif option.get(option_attr) != _option.get(option_attr):
+                                return False, command
+                            else:
+                                continue
+            return True, command
+
         for command in pool:
             if command["name"] == data["name"]:
                 _command = command
@@ -197,83 +270,7 @@ async def __compare_sync(
 
                         elif command.get("options") and data.get("options"):
 
-                            _command_option_names = [_["name"] for _ in command.get("options")]
-                            _data_option_names = [_["name"] for _ in data.get("options")]
-
-                            if any(
-                                _ not in _command_option_names for _ in _data_option_names
-                            ) or len(_data_option_names) != len(_command_option_names):
-                                clean = False
-                                return clean, _command
-
-                            for option in command.get("options"):
-                                for _option in data.get("options"):
-                                    if _option["name"] == option["name"]:
-                                        for option_attr in option_attrs:
-                                            if (
-                                                option.get(option_attr)
-                                                and not _option.get(option_attr)
-                                                or not option.get(option_attr)
-                                                and _option.get(option_attr)
-                                            ):
-                                                clean = False
-                                                return clean, _command
-                                            elif option_attr == "choices":
-                                                if not option.get("choices") or not _option.get(
-                                                    "choices"
-                                                ):
-                                                    continue
-
-                                                _option_choice_names = [
-                                                    _["name"] for _ in option.get("choices")
-                                                ]
-                                                _data_choice_names = [
-                                                    _["name"] for _ in _option.get("choices")
-                                                ]
-
-                                                if any(
-                                                    _ not in _option_choice_names
-                                                    for _ in _data_choice_names
-                                                ) or len(_data_choice_names) != len(
-                                                    _option_choice_names
-                                                ):
-                                                    clean = False
-                                                    return clean, _command
-
-                                                for choice in option.get("choices"):
-                                                    for _choice in _option.get("choices"):
-                                                        if choice["name"] == _choice["name"]:
-                                                            for choice_attr in choice_attrs:
-                                                                if (
-                                                                    choice.get(choice_attr)
-                                                                    and not _choice.get(choice_attr)
-                                                                    or not choice.get(choice_attr)
-                                                                    and _choice.get(choice_attr)
-                                                                ):
-                                                                    clean = False
-                                                                    return clean, _command
-                                                                elif choice.get(
-                                                                    choice_attr
-                                                                ) != _choice.get(choice_attr):
-                                                                    clean = False
-                                                                    return clean, _command
-                                                                else:
-                                                                    continue
-                                            elif option_attr == "required":
-                                                if (
-                                                    option.get(option_attr) == None  # noqa: E711
-                                                    and _option.get(option_attr)
-                                                    == False  # noqa: E712
-                                                ):
-                                                    # API not including if False
-                                                    continue
-                                            elif option.get(option_attr) != _option.get(
-                                                option_attr
-                                            ):
-                                                clean = False
-                                                return clean, _command
-                                            else:
-                                                continue
+                            clean, _command = __check_options(command, data)
 
                         if not clean:
                             return clean, _command
@@ -354,8 +351,8 @@ async def _ready(self) -> None:
             await self.__register_name_autocomplete()
 
             ready = True
-        except Exception as error:
-            log.critical(f"Could not prepare the client: {error}")
+        except Exception:
+            log.exception("Could not prepare the client:")
         finally:
             if ready:
                 log.debug("Client is now ready.")
@@ -398,6 +395,17 @@ async def __get_all_commands(self) -> None:
                 application_id=self.me.id, guild_id=_id, with_localizations=True
             )
 
+            if isinstance(_cmds, dict) and _cmds.get("code"):
+                if int(_cmds.get("code")) != 50001:
+                    raise JSONException(_cmds["code"], message=f'{_cmds["message"]} |')
+
+                log.info(
+                    f"Your bot is missing access to guild with corresponding id {_id}! "
+                    "Syncing commands will not be possible until it is invited with "
+                    "`application.commands` scope!"
+                )
+                continue
+
             for command in _cmds:
                 if command.get("code"):
                     # Error exists.
@@ -431,6 +439,7 @@ async def __sync(self) -> None:  # sourcery no-metrics
 
         __check_global_commands: List[str] = [cmd["name"] for cmd in _cmds]
         __check_guild_commands: Dict[int, List[str]] = {}
+        __blocked_guilds: set = set()
 
         # responsible for checking if a command is in the cache but not a coro -> allowing removal
 
@@ -439,6 +448,19 @@ async def __sync(self) -> None:  # sourcery no-metrics
                 application_id=self.me.id, guild_id=_id, with_localizations=True
             )
 
+            if isinstance(_cmds, dict) and _cmds.get("code"):
+                # Error exists.
+                if int(_cmds.get("code")) != 50001:
+                    raise JSONException(_cmds["code"], message=f'{_cmds["message"]} |')
+
+                log.warning(
+                    f"Your bot is missing access to guild with corresponding id {_id}! "
+                    "Adding commands will not be possible until it is invited with "
+                    "`application.commands` scope!"
+                )
+                __blocked_guilds.add(_id)
+                continue
+
             for command in _cmds:
                 if command.get("code"):
                     # Error exists.
@@ -453,7 +475,9 @@ async def __sync(self) -> None:  # sourcery no-metrics
                     _guild_command: dict
                     for _guild_command in coro._command_data:
                         _guild_id = _guild_command.get("guild_id")
-
+                        if _guild_id in __blocked_guilds:
+                            log.fatal(f"Cannot sync commands on guild with id {_guild_id}!")
+                            raise JSONException(50001, message="Missing Access |")
                         if _guild_command["name"] not in __check_guild_commands[_guild_id]:
                             self.__guild_commands[_guild_id]["clean"] = False
                             self.__guild_commands[_guild_id]["commands"].append(_guild_command)
@@ -999,7 +1023,11 @@ def decorator(coro: Coroutine) -> Callable[..., Any]:
                 ),
                 coro=coro,
             )
-            coro._command_data = commands
+            if hasattr(coro, "__func__"):
+                coro.__func__._command_data = commands
+            else:
+                coro._command_data = commands
+
             self.__command_coroutines.append(coro)
 
             return self.event(coro, name=f"command_{name}")
@@ -1064,7 +1092,11 @@ def decorator(coro: Coroutine) -> Callable[..., Any]:
                 ),
                 coro=coro,
             )
-            coro._command_data = commands
+            if hasattr(coro, "__func__"):
+                coro.__func__._command_data = commands
+            else:
+                coro._command_data = commands
+
             self.__command_coroutines.append(coro)
 
             return self.event(coro, name=f"command_{name}")