Merge pull request #785 from interactions-py/unstable

chore!: release 4.2.1

Author: FayeDel

CONTRIBUTING.rst

@@ -34,9 +34,9 @@ the `Code of Conduct`_ from their documentation.
 Where to start
 --------------
 Our contributions start with an **Issue**. The issue should explain what the problem you're having is.
-Issues are our way and methodology of tracking bugs that may be occuring with this library. Every contributor
-must start with an Issue, as this helps numerous contributors and developers on various teams keep track of
-requests, bugs and miscellaneous details.
+Issues are our way and methodology of tracking bugs that may be occurring with this library. Every contributor
+is recommended to start with an Issue, as this helps numerous contributors and developers on various teams keep
+track of requests, bugs and miscellaneous details.
 
 Issue specifications
 ********************
@@ -45,7 +45,7 @@ Whenever there is an Issue created, they must follow the according criterion:
 - An Issue must not be a duplicate of an existing one.
 - A bug Issue must have all fields filled out.
 - A request Issue must have support from a pre-determined amount of users.
-- A miscellanous Issue must:
+- A miscellaneous Issue must:
     - Target a third-party repository if it is an issue correlated between the two.
     - Specify external issues that tie into library installation or performance.
 
@@ -60,7 +60,7 @@ In order to create create in relevance to the issue, you start a **Pull Request*
 to be changed in the source, and allow other developers to contribute where needed.
 
 When a PR is made, you **must** be targeting the ``unstable`` branch. This is our development branch
-that we use whenever we're working on any bugfixing, breaking changes and/or overall new features. Our
+that we use whenever we're working on any bug-fixing, breaking changes and/or overall new features. Our
 development workflow for changes is from this branch to ``stable``, and then from there to a release.
 
 A pull request must additionally adhere to these following requirements:

interactions/api/gateway/client.py

@@ -311,13 +311,47 @@ def _dispatch_event(self, event: str, data: dict) -> None:  # sourcery no-metric
 
                     if _context.data._json.get("options"):
                         for option in _context.data.options:
-
-                            if option.focused:
-                                __name, _value = self.__sub_command_context(option, _context)
-                                _name += f"_{__name}" if __name else ""
-
-                                if _value:
-                                    __args.append(_value)
+                            if isinstance(option, dict):
+                                option = Option(**option)
+                            if option.type not in (
+                                OptionType.SUB_COMMAND,
+                                OptionType.SUB_COMMAND_GROUP,
+                            ):
+                                if option.focused:
+                                    __name, _value = self.__sub_command_context(option, _context)
+                                    _name += f"_{__name}" if __name else ""
+                                    if _value:
+                                        __args.append(_value)
+
+                            elif option.type == OptionType.SUB_COMMAND:
+                                for _option in option.options:
+                                    if isinstance(_option, dict):
+                                        _option = Option(**_option)
+                                    if _option.focused:
+                                        __name, _value = self.__sub_command_context(
+                                            _option, _context
+                                        )
+                                        _name += f"_{__name}" if __name else ""
+                                        if _value:
+                                            __args.append(_value)
+                                    break
+
+                            elif option.type == OptionType.SUB_COMMAND_GROUP:
+                                for _option in option.options:
+                                    if isinstance(_option, dict):
+                                        _option = Option(**_option)
+                                    for __option in _option.options:
+                                        if isinstance(__option, dict):
+                                            __option = Option(**__option)
+                                        if __option.focused:
+                                            __name, _value = self.__sub_command_context(
+                                                __option, _context
+                                            )
+                                            _name += f"_{__name}" if __name else ""
+                                            if _value:
+                                                __args.append(_value)
+                                        break
+                                    break
                             break
 
                     self._dispatch.dispatch("on_autocomplete", _context)

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
+            [overwrite._json for overwrite 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
+            [overwrite._json for overwrite in ch.permission_overwrites]
             if permission_overwrites is MISSING
             else [overwrite._json for overwrite in permission_overwrites]
         )

interactions/api/models/misc.py

@@ -46,7 +46,7 @@ def __init__(self, **kwargs):
                 # else case if the mixin is used outside of this library and/or SDK.
                 setattr(self, key, kwargs[key])
             else:
-                log.info(
+                log.debug(
                     f"Attribute {key} is missing from the {self.__class__.__name__} data model, skipping."
                 )
                 # work on message printout? Effective, but I think it should be a little bit more friendly