Repository: hikari-py/hikari
Pull request #1013 (2022-02-08 10:21:27)

Remove redundant CommandBuilder fields
### Summary
<!-- Small summary of the merge request -->

### Checklist
<!-- Make sure to tick all the following boxes by putting an `x` in between (like this `[x]`) -->
- [ ] I have run `nox` and all the pipelines have passed.
- [ ] I have made unittests according to the code I have added/modified/deleted.

### Related issues
<!--
To mention an issue use `#issue-id` and to mention a merge request use `!merge-request-id`
To close/fix an issue use `Close #issue-id` or `Fix #issue-id` (depending on the merge request)
-->



Patch:
diff --git a/changes/1012.bugfix.md b/changes/1012.bugfix.md
new file mode 100644
index 00000000..7ea9e9f1
--- /dev/null
+++ b/changes/1012.bugfix.md
@@ -0,0 +1,1 @@
+Sub-command options are now properly deserialized in the autocomplete flow to `AutocompleteInteractionOption` instead of `CommandInteractionOption`.
diff --git a/hikari/api/special_endpoints.py b/hikari/api/special_endpoints.py
index 9c48c321..cd3230d8 100644
--- a/hikari/api/special_endpoints.py
+++ b/hikari/api/special_endpoints.py
@@ -936,7 +936,7 @@ def name(self) -> str:
 
     @property
     @abc.abstractmethod
-    def type(self) -> undefined.UndefinedOr[commands.CommandType]:
+    def type(self) -> commands.CommandType:
         """Return the type of this command.
 
         Returns
diff --git a/hikari/impl/entity_factory.py b/hikari/impl/entity_factory.py
index cfedc4e8..1d36158a 100644
--- a/hikari/impl/entity_factory.py
+++ b/hikari/impl/entity_factory.py
@@ -1825,9 +1825,9 @@ def _deserialize_autocomplete_interaction_option(
         self,
         payload: data_binding.JSONObject,
     ) -> command_interactions.AutocompleteInteractionOption:
-        suboptions: typing.Optional[typing.List[command_interactions.CommandInteractionOption]] = None
+        suboptions: typing.Optional[typing.List[command_interactions.AutocompleteInteractionOption]] = None
         if raw_suboptions := payload.get("options"):
-            suboptions = [self._deserialize_interaction_command_option(suboption) for suboption in raw_suboptions]
+            suboptions = [self._deserialize_autocomplete_interaction_option(suboption) for suboption in raw_suboptions]
 
         is_focused = payload.get("focused", False)
 
@@ -2001,9 +2001,7 @@ def deserialize_autocomplete_interaction(
         if raw_guild_id := payload.get("guild_id"):
             guild_id = snowflakes.Snowflake(raw_guild_id)
 
-        options: typing.Optional[typing.List[command_interactions.AutocompleteInteractionOption]] = None
-        if raw_options := data_payload.get("options"):
-            options = [self._deserialize_autocomplete_interaction_option(option) for option in raw_options]
+        options = [self._deserialize_autocomplete_interaction_option(option) for option in data_payload["options"]]
 
         member: typing.Optional[base_interactions.InteractionMember]
         if member_payload := payload.get("member"):
diff --git a/hikari/impl/special_endpoints.py b/hikari/impl/special_endpoints.py
index 7f1f32d7..bb63e863 100644
--- a/hikari/impl/special_endpoints.py
+++ b/hikari/impl/special_endpoints.py
@@ -934,30 +934,19 @@ def build(self, entity_factory: entity_factory_.EntityFactory, /) -> data_bindin
         return {"type": self._type, "data": data}
 
 
-@attr_extensions.with_copy
 @attr.define(kw_only=False, weakref_slot=False)
 class CommandBuilder(special_endpoints.CommandBuilder):
     """Standard implementation of `hikari.api.special_endpoints.CommandBuilder`."""
 
-    _type: commands.CommandType = attr.field()
     _name: str = attr.field()
 
-    _description: undefined.UndefinedOr[str] = attr.field(default=undefined.UNDEFINED, kw_only=True)
     _id: undefined.UndefinedOr[snowflakes.Snowflake] = attr.field(default=undefined.UNDEFINED, kw_only=True)
     _default_permission: undefined.UndefinedOr[bool] = attr.field(default=undefined.UNDEFINED, kw_only=True)
 
-    _options: undefined.UndefinedOr[typing.List[commands.CommandOption]] = attr.field(
-        default=undefined.UNDEFINED, kw_only=True
-    )
-
     @property
     def id(self) -> undefined.UndefinedOr[snowflakes.Snowflake]:
         return self._id
 
-    @property
-    def type(self) -> undefined.UndefinedOr[commands.CommandType]:
-        return self._type
-
     @property
     def default_permission(self) -> undefined.UndefinedOr[bool]:
         return self._default_permission
@@ -977,11 +966,13 @@ def set_default_permission(self: _CommandBuilderT, state: undefined.UndefinedOr[
     def build(self, entity_factory: entity_factory_.EntityFactory, /) -> data_binding.JSONObjectBuilder:
         data = data_binding.JSONObjectBuilder()
         data["name"] = self._name
+        data["type"] = self.type
         data.put_snowflake("id", self._id)
         data.put("default_permission", self._default_permission)
         return data
 
 
+@attr_extensions.with_copy
 @attr.define(kw_only=False, weakref_slot=False)
 class SlashCommandBuilder(CommandBuilder, special_endpoints.SlashCommandBuilder):
     """Builder class for slash commands."""
@@ -989,12 +980,14 @@ class SlashCommandBuilder(CommandBuilder, special_endpoints.SlashCommandBuilder)
     _description: str = attr.field()
     _options: typing.List[commands.CommandOption] = attr.field(factory=list, kw_only=True)
 
-    _type: commands.CommandType = attr.field(default=commands.CommandType.SLASH, init=False)
-
     @property
     def description(self) -> str:
         return self._description
 
+    @property
+    def type(self) -> commands.CommandType:
+        return commands.CommandType.SLASH
+
     def add_option(self: _SlashCommandBuilderT, option: commands.CommandOption) -> _SlashCommandBuilderT:
         self._options.append(option)
         return self
@@ -1005,20 +998,23 @@ def options(self) -> typing.Sequence[commands.CommandOption]:
 
     def build(self, entity_factory: entity_factory_.EntityFactory, /) -> data_binding.JSONObjectBuilder:
         data = super().build(entity_factory)
-        data["type"] = commands.CommandType.SLASH
         data.put("description", self._description)
         data.put_array("options", self._options, conversion=entity_factory.serialize_command_option)
         return data
 
 
+@attr_extensions.with_copy
 @attr.define(kw_only=False, weakref_slot=False)
 class ContextMenuCommandBuilder(CommandBuilder, special_endpoints.ContextMenuCommandBuilder):
     """Builder class for context menu commands."""
 
-    def build(self, entity_factory: entity_factory_.EntityFactory, /) -> data_binding.JSONObjectBuilder:
-        data = super().build(entity_factory)
-        data["type"] = self._type
-        return data
+    _type: commands.CommandType = attr.field()
+    # name is re-declared here to ensure type is before it in the initializer's args.
+    _name: str = attr.field()
+
+    @property
+    def type(self) -> commands.CommandType:
+        return self._type
 
 
 def _build_emoji(
diff --git a/hikari/interactions/command_interactions.py b/hikari/interactions/command_interactions.py
index 7f7faeee..29d8e9f5 100644
--- a/hikari/interactions/command_interactions.py
+++ b/hikari/interactions/command_interactions.py
@@ -128,6 +128,7 @@ class CommandInteractionOption:
     subcommand or group.
     """
 
+    # TODO: use typing.Self here
     options: typing.Optional[typing.Sequence[CommandInteractionOption]] = attr.field(repr=True)
     """Options provided for this option.
 
@@ -150,6 +151,18 @@ class AutocompleteInteractionOption(CommandInteractionOption):
     even if the option type says otherwise.
     """
 
+    options: typing.Optional[typing.Sequence[AutocompleteInteractionOption]] = attr.field(repr=True)
+    """Options provided for this option.
+
+    Either `AutocompleteInteractionOption.value` or `AutocompleteInteractionOption.options`
+    will be provided with `value` being provided when an option is provided as a
+    parameter with a value and `options` being provided when an option donates a
+    subcommand or group.
+
+    `AutocompleteInteractionOption.is_focused` will be `True` for the value being
+    autocompleted.
+    """
+
 
 @attr_extensions.with_copy
 @attr.define(hash=True, kw_only=True, weakref_slot=False)
@@ -412,9 +425,7 @@ def build_deferred_response(self) -> special_endpoints.InteractionDeferredBuilde
 class AutocompleteInteraction(BaseCommandInteraction):
     """Represents an autocomplete interaction on Discord."""
 
-    options: typing.Optional[typing.Sequence[AutocompleteInteractionOption]] = attr.field(
-        eq=False, hash=False, repr=True
-    )
+    options: typing.Sequence[AutocompleteInteractionOption] = attr.field(eq=False, hash=False, repr=True)
     """Parameter values provided by the user invoking this command."""
 
     def build_response(


Test patch:
diff --git a/tests/hikari/impl/test_entity_factory.py b/tests/hikari/impl/test_entity_factory.py
index 173f8e8c..d6d31fd3 100644
--- a/tests/hikari/impl/test_entity_factory.py
+++ b/tests/hikari/impl/test_entity_factory.py
@@ -412,10 +412,10 @@ def test_deserialize_partial_token(self, entity_factory_impl, client_credentials
         assert isinstance(partial_token, application_models.PartialOAuth2Token)
 
     @pytest.fixture()
-    def access_token_payload(self, deserialize_rest_guild_payload, incoming_webhook_payload):
+    def access_token_payload(self, rest_guild_payload, incoming_webhook_payload):
         return {
             "token_type": "Bearer",
-            "guild": deserialize_rest_guild_payload,
+            "guild": rest_guild_payload,
             "access_token": "zMndOe7jFLXGawdlxMOdNvXjjOce5X",
             "scope": "bot webhook.incoming",
             "expires_in": 2419200,
@@ -424,12 +424,12 @@ def access_token_payload(self, deserialize_rest_guild_payload, incoming_webhook_
         }
 
     def test_deserialize_authorization_token(
-        self, entity_factory_impl, access_token_payload, deserialize_rest_guild_payload, incoming_webhook_payload
+        self, entity_factory_impl, access_token_payload, rest_guild_payload, incoming_webhook_payload
     ):
         access_token = entity_factory_impl.deserialize_authorization_token(access_token_payload)
 
         assert access_token.token_type is application_models.TokenType.BEARER
-        assert access_token.guild == entity_factory_impl.deserialize_rest_guild(deserialize_rest_guild_payload)
+        assert access_token.guild == entity_factory_impl.deserialize_rest_guild(rest_guild_payload)
         assert access_token.access_token == "zMndOe7jFLXGawdlxMOdNvXjjOce5X"
         assert access_token.scopes == [
             application_models.OAuth2Scope.BOT,
@@ -2241,7 +2241,7 @@ def test_deserialize_guild_preview_with_null_fields(self, entity_factory_impl, m
         assert guild_preview.description is None
 
     @pytest.fixture()
-    def deserialize_rest_guild_payload(
+    def rest_guild_payload(
         self,
         known_custom_emoji_payload,
         guild_role_payload,
@@ -2289,11 +2289,11 @@ def test_deserialize_rest_guild(
         self,
         entity_factory_impl,
         mock_app,
-        deserialize_rest_guild_payload,
+        rest_guild_payload,
         known_custom_emoji_payload,
         guild_role_payload,
     ):
-        guild = entity_factory_impl.deserialize_rest_guild(deserialize_rest_guild_payload)
+        guild = entity_factory_impl.deserialize_rest_guild(rest_guild_payload)
         assert guild.app is mock_app
         assert guild.id == 265828729970753537
         assert guild.name == "L33t guild"
@@ -2441,7 +2441,7 @@ def test_deserialize_rest_guild_with_null_fields(self, entity_factory_impl):
         assert guild.public_updates_channel_id is None
 
     @pytest.fixture()
-    def deserialize_gateway_guild_payload(
+    def gateway_guild_payload(
         self,
         guild_text_channel_payload,
         guild_voice_channel_payload,
@@ -2501,7 +2501,7 @@ def test_deserialize_gateway_guild(
         self,
         entity_factory_impl,
         mock_app,
-        deserialize_gateway_guild_payload,
+        gateway_guild_payload,
         guild_text_channel_payload,
         guild_voice_channel_payload,
         guild_news_channel_payload,
@@ -2511,7 +2511,7 @@ def test_deserialize_gateway_guild(
         guild_role_payload,
         voice_state_payload,
     ):
-        guild_definition = entity_factory_impl.deserialize_gateway_guild(deserialize_gateway_guild_payload)
+        guild_definition = entity_factory_impl.deserialize_gateway_guild(gateway_guild_payload)
         guild = guild_definition.guild
         assert guild.app is mock_app
         assert guild.id == 265828729970753537
@@ -2700,11 +2700,9 @@ def test_deserialize_gateway_guild_with_null_fields(self, entity_factory_impl):
         assert guild.premium_subscription_count is None
         assert guild.public_updates_channel_id is None
 
-    def test_deserialize_gateway_guild_ignores_unrecognised_channels(
-        self, entity_factory_impl, deserialize_gateway_guild_payload
-    ):
-        deserialize_gateway_guild_payload["channels"] = [{"id": 123, "type": 1000}]
-        guild_definition = entity_factory_impl.deserialize_gateway_guild(deserialize_gateway_guild_payload)
+    def test_deserialize_gateway_guild_ignores_unrecognised_channels(self, entity_factory_impl, gateway_guild_payload):
+        gateway_guild_payload["channels"] = [{"id": 123, "type": 1000}]
+        guild_definition = entity_factory_impl.deserialize_gateway_guild(gateway_guild_payload)
 
         assert guild_definition.channels == {}
 
@@ -2968,13 +2966,71 @@ def test__deserialize_interaction_member_with_passed_user(
 
         assert member.user is mock_user
 
+    def test__deserialize_resolved_option_data(
+        self,
+        entity_factory_impl,
+        interaction_resolved_data_payload,
+        user_payload,
+        guild_role_payload,
+        interaction_member_payload,
+        message_payload,
+    ):
+        resolved = entity_factory_impl._deserialize_resolved_option_data(
+            interaction_resolved_data_payload, guild_id=123321
+        )
+
+        # ResolvedOptionData
+        assert len(resolved.channels) == 1
+        channel = resolved.channels[695382395666300958]
+        assert channel.type is channel_models.ChannelType.GUILD_TEXT
+        assert channel.id == 695382395666300958
+        assert channel.name == "discord-announcements"
+        assert channel.permissions == permission_models.Permissions(17179869183)
+        assert isinstance(channel, command_interactions.InteractionChannel)
+        assert len(resolved.members) == 1
+        member = resolved.members[115590097100865541]
+        assert member == entity_factory_impl._deserialize_interaction_member(
+            interaction_member_payload, guild_id=123321, user=entity_factory_impl.deserialize_user(user_payload)
+        )
+
+        assert resolved.roles == {
+            41771983423143936: entity_factory_impl.deserialize_role(guild_role_payload, guild_id=123321)
+        }
+        assert resolved.users == {115590097100865541: entity_factory_impl.deserialize_user(user_payload)}
+        assert resolved.messages == {123: entity_factory_impl.deserialize_message(message_payload)}
+
+        assert isinstance(resolved, command_interactions.ResolvedOptionData)
+
+    def test__deserialize_resolved_option_data_with_empty_resolved_resources(self, entity_factory_impl):
+        resolved = entity_factory_impl._deserialize_resolved_option_data({})
+
+        assert resolved.channels == {}
+        assert resolved.members == {}
+        assert resolved.roles == {}
+        assert resolved.users == {}
+        assert resolved.messages == {}
+
     @pytest.fixture()
-    def command_interaction_payload(
-        self, member_payload, user_payload, guild_role_payload, interaction_member_payload, message_payload
+    def interaction_resolved_data_payload(
+        self, interaction_member_payload, guild_role_payload, user_payload, message_payload
     ):
-        member_payload = member_payload.copy()
-        member_payload["permissions"] = "47"
-        del member_payload["user"]
+        return {
+            "channels": {
+                "695382395666300958": {
+                    "id": "695382395666300958",
+                    "name": "discord-announcements",
+                    "permissions": "17179869183",
+                    "type": 0,
+                }
+            },
+            "members": {"115590097100865541": interaction_member_payload},
+            "roles": {"41771983423143936": guild_role_payload},
+            "users": {"115590097100865541": user_payload},
+            "messages": {"123": message_payload},
+        }
+
+    @pytest.fixture()
+    def command_interaction_payload(self, interaction_member_payload, interaction_resolved_data_payload):
         return {
             "id": "3490190239012093",
             "type": 2,
@@ -2993,20 +3049,7 @@ def command_interaction_payload(
                         ],
                     },
                 ],
-                "resolved": {
-                    "channels": {
-                        "695382395666300958": {
-                            "id": "695382395666300958",
-                            "name": "discord-announcements",
-                            "permissions": "17179869183",
-                            "type": 0,
-                        }
-                    },
-                    "members": {"115590097100865541": member_payload},
-                    "roles": {"41771983423143936": guild_role_payload},
-                    "users": {"115590097100865541": user_payload},
-                    "messages": {"123": message_payload},
-                },
+                "resolved": interaction_resolved_data_payload,
             },
             "channel_id": "49949494",
             "member": interaction_member_payload,
@@ -3022,17 +3065,10 @@ def test_deserialize_command_interaction(
         entity_factory_impl,
         mock_app,
         command_interaction_payload,
-        user_payload,
-        guild_role_payload,
         interaction_member_payload,
-        member_payload,
-        message_payload,
+        interaction_resolved_data_payload,
     ):
         interaction = entity_factory_impl.deserialize_command_interaction(command_interaction_payload)
-        member_payload = member_payload.copy()
-        del member_payload["user"]
-        member_payload["permissions"] = "47"
-
         assert interaction.app is mock_app
         assert interaction.application_id == 76234234
         assert interaction.id == 3490190239012093
@@ -3043,14 +3079,15 @@ def test_deserialize_command_interaction(
         assert interaction.guild_id == 43123123
         assert interaction.locale == "es-ES"
         assert interaction.guild_locale == "en-US"
-
-        # InteractionMember
         assert interaction.member == entity_factory_impl._deserialize_interaction_member(
             interaction_member_payload, guild_id=43123123
         )
         assert interaction.user is interaction.member.user
         assert interaction.command_id == 43123123
         assert interaction.command_name == "okokokok"
+        assert interaction.resolved == entity_factory_impl._deserialize_resolved_option_data(
+            interaction_resolved_data_payload, guild_id=43123123
+        )
 
         # CommandInteractionOption
         assert len(interaction.options) == 1
@@ -3059,12 +3096,14 @@ def test_deserialize_command_interaction(
         assert option.value is None
         assert option.type is commands.OptionType.SUB_COMMAND
         assert len(option.options) == 2
+
         sub_option1 = option.options[0]
         assert sub_option1.name == "go ice"
         assert sub_option1.value == "42"
         assert sub_option1.type is commands.OptionType.INTEGER
         assert sub_option1.options is None
         assert isinstance(sub_option1, command_interactions.CommandInteractionOption)
+
         sub_option2 = option.options[1]
         assert sub_option2.name == "go fire"
         assert sub_option2.value == 123123123
@@ -3074,29 +3113,15 @@ def test_deserialize_command_interaction(
         assert isinstance(sub_option2, command_interactions.CommandInteractionOption)
         assert isinstance(option, command_interactions.CommandInteractionOption)
 
-        # ResolvedOptionData
-        assert len(interaction.resolved.channels) == 1
-        channel = interaction.resolved.channels[695382395666300958]
-        assert channel.type is channel_models.ChannelType.GUILD_TEXT
-        assert channel.id == 695382395666300958
-        assert channel.name == "discord-announcements"
-        assert channel.permissions == permission_models.Permissions(17179869183)
-        assert isinstance(channel, command_interactions.InteractionChannel)
-        # InteractionMember
-        assert len(interaction.resolved.members) == 1
-        member = interaction.resolved.members[115590097100865541]
-        assert member == entity_factory_impl._deserialize_interaction_member(
-            member_payload, guild_id=43123123, user=entity_factory_impl.deserialize_user(user_payload)
-        )
-
-        assert interaction.resolved.roles == {
-            41771983423143936: entity_factory_impl.deserialize_role(guild_role_payload, guild_id=43123123)
-        }
-        assert interaction.resolved.users == {115590097100865541: entity_factory_impl.deserialize_user(user_payload)}
-        assert interaction.resolved.messages == {123: entity_factory_impl.deserialize_message(message_payload)}
-
-        assert isinstance(interaction.resolved, command_interactions.ResolvedOptionData)
+        assert isinstance(interaction, command_interactions.CommandInteraction)
 
+    def test_deserialize_command_interaction_with_context_menu_field(
+        self,
+        entity_factory_impl,
+        context_menu_command_interaction_payload,
+    ):
+        interaction = entity_factory_impl.deserialize_command_interaction(context_menu_command_interaction_payload)
+        assert interaction.target_id == 115590097100865541
         assert isinstance(interaction, command_interactions.CommandInteraction)
 
     def test_deserialize_command_interaction_with_null_attributes(
@@ -3105,8 +3130,8 @@ def test_deserialize_command_interaction_with_null_attributes(
         del command_interaction_payload["guild_id"]
         del command_interaction_payload["member"]
         command_interaction_payload["user"] = user_payload
-        del command_interaction_payload["data"]["options"]
         del command_interaction_payload["data"]["resolved"]
+        del command_interaction_payload["data"]["options"]
 
         interaction = entity_factory_impl.deserialize_command_interaction(command_interaction_payload)
 
@@ -3116,26 +3141,8 @@ def test_deserialize_command_interaction_with_null_attributes(
         assert interaction.options is None
         assert interaction.resolved is None
 
-    def test_deserialize_command_interaction_with_empty_resolved_resources(
-        self, entity_factory_impl, mock_app, command_interaction_payload, user_payload
-    ):
-        del command_interaction_payload["data"]["resolved"]["channels"]
-        del command_interaction_payload["data"]["resolved"]["members"]
-        del command_interaction_payload["data"]["resolved"]["roles"]
-        del command_interaction_payload["data"]["resolved"]["users"]
-        # This makes sure the bool check to see if there's anything in resolve will still pass
-        # to separate this case from it just not being provided
-        command_interaction_payload["data"]["resolved"]["not a real field"] = 42
-
-        interaction = entity_factory_impl.deserialize_command_interaction(command_interaction_payload)
-
-        assert interaction.resolved.channels == {}
-        assert interaction.resolved.members == {}
-        assert interaction.resolved.roles == {}
-        assert interaction.resolved.users == {}
-
     @pytest.fixture()
-    def autocomplete_interaction_payload(self, user_payload):
+    def autocomplete_interaction_payload(self, user_payload, interaction_resolved_data_payload):
         return {
             "id": "3490190239012093",
             "type": 4,
@@ -3145,10 +3152,16 @@ def autocomplete_interaction_payload(self, user_payload):
                 "name": "okokokok",
                 "type": 1,
                 "options": [
-                    {"name": "go ice", "type": 4, "value": 42},
-                    {"name": "go fire", "type": 3, "value": "typing...", "focused": True},
+                    {
+                        "name": "options",
+                        "type": 1,
+                        "options": [
+                            {"name": "meat", "type": 4, "value": 123312},
+                            {"name": "yeet", "type": 3, "value": "ea", "focused": True},
+                        ],
+                    },
                 ],
-                "resolved": {},
+                "resolved": interaction_resolved_data_payload,
             },
             "channel_id": "49949494",
             "user": user_payload,
@@ -3159,45 +3172,8 @@ def autocomplete_interaction_payload(self, user_payload):
             "application_id": "76234234",
         }
 
-    @pytest.fixture()
-    def autocomplete_interaction_payload_with_optional(
-        self,
-        interaction_member_payload,
-        user_payload,
-    ):
-        return {
-            "id": "3490190239012093",
-            "type": 4,
-            "guild_id": "43123123",
-            "data": {
-                "id": "43123123",
-                "name": "okokokok",
-                "type": 1,
-                "options": [
-                    {"name": "go ice", "type": 6, "value": "115590097100865541"},
-                    {"name": "go fire", "type": 3, "value": "typing...", "focused": True},
-                    {"name": "stuff", "type": 1, "value": {"name": "stuff", "type": 3, "value": "none"}},
-                ],
-                "resolved": {
-                    "users": {
-                        "115590097100865541": user_payload,
-                    }
-                },
-            },
-            "channel_id": "49949494",
-            "member": interaction_member_payload,
-            "token": "moe cat girls",
-            "locale": "es-ES",
-            "guild_locale": "en-US",
-            "version": 69420,
-            "application_id": "76234234",
-        }
-
     def test_deserialize_autocomplete_interaction(
-        self,
-        entity_factory_impl,
-        mock_app,
-        autocomplete_interaction_payload,
+        self, entity_factory_impl, mock_app, autocomplete_interaction_payload, interaction_resolved_data_payload
     ):
         interaction = entity_factory_impl.deserialize_autocomplete_interaction(autocomplete_interaction_payload)
 
@@ -3211,23 +3187,66 @@ def test_deserialize_autocomplete_interaction(
         assert interaction.guild_id == 43123123
         assert interaction.locale == "es-ES"
         assert interaction.guild_locale == "en-US"
+        assert interaction.resolved == entity_factory_impl._deserialize_resolved_option_data(
+            interaction_resolved_data_payload, guild_id=43123123
+        )
 
-        assert len(interaction.options) == 2
-        assert interaction.options[0].value == 42
-        assert interaction.options[1].value == "typing..."
-        assert interaction.options[1].is_focused
+        # AutocompleteInteractionOption
+        assert len(interaction.options) == 1
+        option = interaction.options[0]
+        assert option.name == "options"
+        assert option.value is None
+        assert option.type is commands.OptionType.SUB_COMMAND
+        assert len(option.options) == 2
 
-    def test_deserialize_autocomplete_interaction_with_optional(
-        self,
-        entity_factory_impl,
-        mock_app,
-        autocomplete_interaction_payload_with_optional,
-    ):
+        sub_option1 = option.options[0]
+        assert sub_option1.name == "meat"
+        assert sub_option1.value == 123312
+        assert sub_option1.type is commands.OptionType.INTEGER
+        assert sub_option1.options is None
+        assert sub_option1.is_focused is False
+        assert isinstance(sub_option1, command_interactions.CommandInteractionOption)
+
+        sub_option2 = option.options[1]
+        assert sub_option2.name == "yeet"
+        assert sub_option2.value == "ea"
+        assert sub_option2.type is commands.OptionType.STRING
+        assert sub_option2.options is None
+        assert sub_option2.is_focused is True
+        assert isinstance(sub_option2, command_interactions.AutocompleteInteractionOption)
+        assert isinstance(option, command_interactions.AutocompleteInteractionOption)
+
+        assert isinstance(interaction, command_interactions.AutocompleteInteraction)
+
+    def test_deserialize_autocomplete_interaction_with_null_fields(self, entity_factory_impl, user_payload, mock_app):
         interaction = entity_factory_impl.deserialize_autocomplete_interaction(
-            autocomplete_interaction_payload_with_optional
+            {
+                "id": "3490190239012093",
+                "type": 4,
+                "data": {
+                    "id": "43123123",
+                    "name": "okokokok",
+                    "type": 1,
+                    "options": [
+                        {"name": "go ice", "type": 6, "value": "115590097100865541"},
+                        {"name": "go fire", "type": 3, "value": "typing...", "focused": True},
+                        {"name": "stuff", "type": 1, "value": {"name": "stuff", "type": 3, "value": "none"}},
+                    ],
+                },
+                "user": user_payload,
+                "channel_id": "49949494",
+                "token": "moe cat girls",
+                "locale": "es-ES",
+                "guild_locale": "en-US",
+                "version": 69420,
+                "application_id": "76234234",
+            }
         )
 
-        assert interaction
+        assert interaction.guild_id is None
+        assert interaction.member is None
+        assert interaction.user == entity_factory_impl.deserialize_user(user_payload)
+        assert interaction.resolved is None
 
     def test_deserialize_interaction_returns_expected_type(
         self, entity_factory_impl, command_interaction_payload, component_interaction_payload
@@ -3384,15 +3403,6 @@ def context_menu_command_interaction_payload(self, interaction_member_payload, u
             "application_id": "76234234",
         }
 
-    def test_deserialize_context_menu_command_interaction(
-        self,
-        entity_factory_impl,
-        context_menu_command_interaction_payload,
-    ):
-        interaction = entity_factory_impl.deserialize_command_interaction(context_menu_command_interaction_payload)
-        assert isinstance(interaction, command_interactions.CommandInteraction)
-        assert interaction.target_id == 115590097100865541
-
     @pytest.fixture()
     def context_menu_command_payload(self):
         return {