hikari-arc 1.3.4__py3-none-any.whl → 2.0.0__py3-none-any.whl

arc/abc/command.py

@@ -186,7 +186,8 @@ class _CommandSettings:
     autodefer: AutodeferMode | hikari.UndefinedType
     default_permissions: hikari.Permissions | hikari.UndefinedType
     is_nsfw: bool | hikari.UndefinedType
-    is_dm_enabled: bool | hikari.UndefinedType
+    integration_types: t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType
+    invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType
 
     def apply(self, other: te.Self) -> te.Self:
         """Apply 'other' to this, copying all the non-undefined settings to it."""
@@ -196,13 +197,28 @@ class _CommandSettings:
             if other.default_permissions is not hikari.UNDEFINED
             else self.default_permissions,
             is_nsfw=other.is_nsfw if other.is_nsfw is not hikari.UNDEFINED else self.is_nsfw,
-            is_dm_enabled=other.is_dm_enabled if other.is_dm_enabled is not hikari.UNDEFINED else self.is_dm_enabled,
+            integration_types=other.integration_types
+            if other.integration_types is not hikari.UNDEFINED
+            else self.integration_types,
+            invocation_contexts=other.invocation_contexts
+            if other.invocation_contexts is not hikari.UNDEFINED
+            else self.invocation_contexts,
         )
 
     @classmethod
     def default(cls) -> te.Self:
         """Get the default command settings."""
-        return cls(autodefer=AutodeferMode.ON, default_permissions=hikari.UNDEFINED, is_nsfw=False, is_dm_enabled=True)
+        return cls(
+            autodefer=AutodeferMode.ON,
+            default_permissions=hikari.UNDEFINED,
+            is_nsfw=False,
+            integration_types=[hikari.ApplicationIntegrationType.GUILD_INSTALL],
+            invocation_contexts=[
+                hikari.ApplicationContextType.GUILD,
+                hikari.ApplicationContextType.BOT_DM,
+                hikari.ApplicationContextType.PRIVATE_CHANNEL,
+            ],
+        )
 
 
 @attr.define(slots=True, kw_only=True)
@@ -223,8 +239,15 @@ class CommandBase(
     _autodefer: AutodeferMode | hikari.UndefinedType = attr.field(default=hikari.UNDEFINED, alias="autodefer")
     """If ON, this command will be automatically deferred if it takes longer than 2 seconds to respond."""
 
-    _is_dm_enabled: bool | hikari.UndefinedType = attr.field(default=hikari.UNDEFINED, alias="is_dm_enabled")
-    """Whether this command is enabled in DMs."""
+    _integration_types: t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType = attr.field(
+        default=hikari.UNDEFINED, alias="integration_types"
+    )
+    """A list of integration types where the command can be installed in."""
+
+    _invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType = attr.field(
+        default=hikari.UNDEFINED, alias="invocation_contexts"
+    )
+    """A list of context types where the command can be used in."""
 
     _default_permissions: hikari.Permissions | hikari.UndefinedType = attr.field(
         default=hikari.UNDEFINED, alias="default_permissions"
@@ -320,10 +343,28 @@ class CommandBase(
         return settings.autodefer if settings.autodefer is not hikari.UNDEFINED else AutodeferMode.ON
 
     @property
-    def is_dm_enabled(self) -> bool:
-        """Whether this command is enabled in DMs."""
+    def integration_types(self) -> t.Sequence[hikari.ApplicationIntegrationType]:
+        """A list of integration types where the command can be installed in."""
         settings = self._resolve_settings()
-        return settings.is_dm_enabled if settings.is_dm_enabled is not hikari.UNDEFINED else True
+        return (
+            settings.integration_types
+            if settings.integration_types is not hikari.UNDEFINED
+            else [hikari.ApplicationIntegrationType.GUILD_INSTALL]
+        )
+
+    @property
+    def invocation_contexts(self) -> t.Sequence[hikari.ApplicationContextType]:
+        """A list of context types where the command can be used in."""
+        settings = self._resolve_settings()
+        return (
+            settings.invocation_contexts
+            if settings.invocation_contexts is not hikari.UNDEFINED
+            else [
+                hikari.ApplicationContextType.GUILD,
+                hikari.ApplicationContextType.BOT_DM,
+                hikari.ApplicationContextType.PRIVATE_CHANNEL,
+            ]
+        )
 
     @property
     def default_permissions(self) -> hikari.Permissions | hikari.UndefinedType:
@@ -383,7 +424,8 @@ class CommandBase(
                 autodefer=self._autodefer,
                 default_permissions=self._default_permissions,
                 is_nsfw=self._is_nsfw,
-                is_dm_enabled=self._is_dm_enabled,
+                integration_types=self._integration_types,
+                invocation_contexts=self._invocation_contexts,
             )
         )
 
@@ -488,7 +530,8 @@ class CommandBase(
             "nsfw": self.is_nsfw,
             "default_member_permissions": self.default_permissions,
             "name_localizations": self.name_localizations,
-            "dm_enabled": self.is_dm_enabled,
+            "integration_types": self.integration_types,
+            "invocation_contexts": self.invocation_contexts,
         }
 
     @abc.abstractmethod
@@ -550,7 +593,7 @@ class CommandBase(
             for hook in hooks:
                 res = await ctx._injection_ctx.call_with_async_di(hook, ctx)
 
-                res = t.cast(HookResult | None, res)
+                res = t.cast("HookResult | None", res)
 
                 if res and res._abort:
                     aborted = True

arc/abc/option.py

@@ -17,14 +17,14 @@ if t.TYPE_CHECKING:
     from arc.abc.command import CommandProto
 
 __all__ = (
+    "CommandOptionBase",
+    "ConverterOption",
     "Option",
+    "OptionBase",
     "OptionParams",
+    "OptionType",
     "OptionWithChoices",
     "OptionWithChoicesParams",
-    "OptionBase",
-    "CommandOptionBase",
-    "ConverterOption",
-    "OptionType",
 )
 
 T = t.TypeVar("T")
@@ -102,6 +102,9 @@ class OptionType(enum.IntEnum):
     COLOR = 10002
     """Denotes a command option where the value will be a color."""
 
+    EMOJI = 10003
+    """Denotes a command option where the value will be an emoji."""
+
     @classmethod
     def from_hikari(cls, option_type: hikari.OptionType) -> OptionType:
         """Convert a hikari.OptionType to an OptionType."""
@@ -133,7 +136,7 @@ class OptionParams(t.Generic[T]):
         The description of the option in different locales
     """
 
-    __slots__: t.Sequence[str] = ("_name", "_description", "_name_localizations", "_description_localizations")
+    __slots__: t.Sequence[str] = ("_description", "_description_localizations", "_name", "_name_localizations")
 
     def __init__(
         self,
@@ -191,7 +194,7 @@ class OptionWithChoicesParams(OptionParams[ChoiceT], t.Generic[ChoiceT, ClientT]
         The callback for autocompleting the option.
     """
 
-    __slots__: t.Sequence[str] = ("_choices", "_autocomplete_with")
+    __slots__: t.Sequence[str] = ("_autocomplete_with", "_choices")
 
     def __init__(
         self,
@@ -248,8 +251,8 @@ class OptionBase(abc.ABC, t.Generic[T]):
             "name": self.name,
             "description": self.description,
             "autocomplete": False,
-            "name_localizations": self.name_localizations,
-            "description_localizations": self.description_localizations,
+            "name_localizations": {str(key): value for key, value in self.name_localizations.items()},
+            "description_localizations": {str(key): value for key, value in self.description_localizations.items()},
         }
 
     def to_command_option(self) -> hikari.CommandOption:

arc/abc/plugin.py

@@ -41,8 +41,11 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
     autodefer : bool | AutodeferMode
         If True, all commands in this plugin will automatically defer if it is taking longer than 2 seconds to respond.
         This can be overridden on a per-command basis.
-    is_dm_enabled : bool | hikari.UndefinedType
-        Whether commands in this plugin are enabled in DMs
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType
+        The integration types that commands will support the installation of
+        This can be overridden on a per-command basis.
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType
+        The context types that commands can be invoked in
         This can be overridden on a per-command basis.
     default_permissions : hikari.Permissions | hikari.UndefinedType
         The default permissions for this plugin
@@ -53,16 +56,16 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
 
     __slots__: t.Sequence[str] = (
         "_client",
-        "_name",
-        "_default_enabled_guilds",
         "_cmd_settings",
-        "_slash_commands",
-        "_user_commands",
-        "_message_commands",
+        "_concurrency_limiter",
+        "_default_enabled_guilds",
         "_error_handler",
         "_hooks",
+        "_message_commands",
+        "_name",
         "_post_hooks",
-        "_concurrency_limiter",
+        "_slash_commands",
+        "_user_commands",
     )
 
     def __init__(
@@ -72,7 +75,8 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
         default_enabled_guilds: t.Sequence[hikari.Snowflakeish | hikari.PartialGuild]
         | hikari.UndefinedType = hikari.UNDEFINED,
         autodefer: bool | AutodeferMode | hikari.UndefinedType = hikari.UNDEFINED,
-        is_dm_enabled: bool | hikari.UndefinedType = hikari.UNDEFINED,
+        integration_types: t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType = hikari.UNDEFINED,
+        invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType = hikari.UNDEFINED,
         default_permissions: hikari.Permissions | hikari.UndefinedType = hikari.UNDEFINED,
         is_nsfw: bool | hikari.UndefinedType = hikari.UNDEFINED,
     ) -> None:
@@ -83,10 +87,12 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
             if default_enabled_guilds is not hikari.UNDEFINED
             else hikari.UNDEFINED
         )
+
         self._cmd_settings = _CommandSettings(
             autodefer=AutodeferMode(autodefer) if isinstance(autodefer, bool) else autodefer,
-            is_dm_enabled=is_dm_enabled,
             default_permissions=default_permissions,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             is_nsfw=is_nsfw,
         )
 
@@ -257,7 +263,8 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
         *,
         guilds: t.Sequence[hikari.Snowflakeish | hikari.PartialGuild] | hikari.UndefinedType = hikari.UNDEFINED,
         autodefer: bool | AutodeferMode | hikari.UndefinedType = hikari.UNDEFINED,
-        is_dm_enabled: bool | hikari.UndefinedType = hikari.UNDEFINED,
+        integration_types: t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType = hikari.UNDEFINED,
+        invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType = hikari.UNDEFINED,
         is_nsfw: bool | hikari.UndefinedType = hikari.UNDEFINED,
         default_permissions: hikari.Permissions | hikari.UndefinedType = hikari.UNDEFINED,
         name_localizations: t.Mapping[hikari.Locale, str] | None = None,
@@ -276,8 +283,10 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
         autodefer : bool | AutodeferMode
             If True, all commands in this group will automatically defer if it is taking longer than 2 seconds to respond.
             This can be overridden on a per-subcommand basis.
-        is_dm_enabled : bool
-            Whether the slash command group is enabled in DMs
+        invocation_contexts : t.Sequence[hikari.ApplicationContextType]
+            The context types to enable the slash command group in
+        integration_types : t.Sequence[hikari.ApplicationIntegrationType]
+            The integration types to enable the slash command group in
         default_permissions : hikari.Permissions | hikari.UndefinedType
             The default permissions for the slash command group
         name_localizations : dict[hikari.Locale, str]
@@ -313,7 +322,8 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
             description=description,
             guilds=guild_ids,
             autodefer=AutodeferMode(autodefer) if isinstance(autodefer, bool) else autodefer,
-            is_dm_enabled=is_dm_enabled,
+            invocation_contexts=invocation_contexts,
+            integration_types=integration_types,
             default_permissions=default_permissions,
             name_localizations=name_localizations or {},
             description_localizations=description_localizations or {},
@@ -399,6 +409,66 @@ class PluginBase(HasErrorHandler[ClientT], Hookable[ClientT], HasConcurrencyLimi
 
         return decorator
 
+    @t.overload
+    def find_command(
+        self, command_type: t.Literal[hikari.CommandType.USER], full_name: str
+    ) -> UserCommand[ClientT] | None: ...
+
+    @t.overload
+    def find_command(
+        self, command_type: t.Literal[hikari.CommandType.MESSAGE], full_name: str
+    ) -> MessageCommand[ClientT] | None: ...
+
+    @t.overload
+    def find_command(
+        self, command_type: t.Literal[hikari.CommandType.SLASH], full_name: str
+    ) -> SlashCommand[ClientT] | SlashSubCommand[ClientT] | SlashGroup[ClientT] | SlashSubGroup[ClientT] | None: ...
+
+    def find_command(self, command_type: hikari.CommandType, full_name: str) -> t.Any | None:
+        """Find a given command by it's fully qualified name.
+
+        For instance, to locate a slash subcommand with the name `foo` in a group `bar`, you would pass `bar foo`.
+
+        Parameters
+        ----------
+        command_type : hikari.CommandType
+            The type of command to search for.
+        full_name : str
+            The fully qualified name of the command.
+
+        Returns
+        -------
+        t.Any | None
+            The command if found, otherwise None.
+        """
+        if command_type is hikari.CommandType.MESSAGE:
+            return self._message_commands.get(full_name)
+        if command_type is hikari.CommandType.USER:
+            return self._user_commands.get(full_name)
+
+        if command_type is not hikari.CommandType.SLASH:
+            return None
+
+        command_parts = full_name.split(" ")
+
+        if len(command_parts) == 1:
+            return self._slash_commands.get(command_parts[0])
+
+        base_cmd = self._slash_commands.get(command_parts[0])
+
+        if not isinstance(base_cmd, SlashGroup):
+            return None
+
+        subcmd = base_cmd.children.get(command_parts[1])
+
+        if len(command_parts) == 2:
+            return subcmd
+
+        if not isinstance(subcmd, SlashSubGroup):
+            return None
+
+        return subcmd.children.get(command_parts[2])
+
     @t.overload
     def walk_commands(
         self, command_type: t.Literal[hikari.CommandType.USER], *, callable_only: bool = False

arc/client.py

@@ -21,14 +21,14 @@ if t.TYPE_CHECKING:
     from arc.internal.types import EventCallbackT, EventT, ResponseBuilderT
 
 __all__ = (
-    "GatewayClientBase",
-    "RESTClientBase",
     "GatewayClient",
-    "RESTClient",
+    "GatewayClientBase",
     "GatewayContext",
+    "GatewayPlugin",
+    "RESTClient",
+    "RESTClientBase",
     "RESTContext",
     "RESTPlugin",
-    "GatewayPlugin",
 )
 
 
@@ -61,9 +61,12 @@ class GatewayClientBase(Client[GatewayBotT]):
     is_nsfw : bool
         Whether commands are NSFW
         This applies to all commands, and can be overridden on a per-command basis.
-    is_dm_enabled : bool
-        Whether commands are enabled in DMs
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType]
+        The integration types that commands will support the installation of
         This applies to all commands, and can be overridden on a per-command basis.
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType]
+        The context types that commands can be invoked in
+        This applies to all commands, and can be overridden on a per-command basis
     provided_locales : t.Sequence[hikari.Locale] | None
         The locales that will be provided to the client by locale provider callbacks
     injector : alluka.Client | None
@@ -83,7 +86,14 @@ class GatewayClientBase(Client[GatewayBotT]):
         autodefer: bool | AutodeferMode = True,
         default_permissions: hikari.Permissions | hikari.UndefinedType = hikari.UNDEFINED,
         is_nsfw: bool = False,
-        is_dm_enabled: bool = True,
+        integration_types: t.Sequence[hikari.ApplicationIntegrationType] = [
+            hikari.ApplicationIntegrationType.GUILD_INSTALL
+        ],
+        invocation_contexts: t.Sequence[hikari.ApplicationContextType] = [
+            hikari.ApplicationContextType.GUILD,
+            hikari.ApplicationContextType.PRIVATE_CHANNEL,
+            hikari.ApplicationContextType.BOT_DM,
+        ],
         provided_locales: t.Sequence[hikari.Locale] | None = None,
         injector: alluka.abc.Client | None = None,
     ) -> None:
@@ -94,7 +104,8 @@ class GatewayClientBase(Client[GatewayBotT]):
             autodefer=autodefer,
             default_permissions=default_permissions,
             is_nsfw=is_nsfw,
-            is_dm_enabled=is_dm_enabled,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             provided_locales=provided_locales,
             injector=injector,
         )
@@ -216,9 +227,12 @@ class RESTClientBase(Client[RESTBotT]):
     is_nsfw : bool
         Whether commands are NSFW
         This applies to all commands, and can be overridden on a per-command basis.
-    is_dm_enabled : bool
-        Whether commands are enabled in DMs
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType]
+        The integration types that commands will support the installation of
         This applies to all commands, and can be overridden on a per-command basis.
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType]
+        The context types that commands can be invoked in
+        This applies to all commands, and can be overridden on a per-command basis
     provided_locales : t.Sequence[hikari.Locale] | None
         The locales that will be provided to the client by locale provider callbacks
     injector : alluka.abc.Client | None
@@ -237,8 +251,15 @@ class RESTClientBase(Client[RESTBotT]):
         autosync: bool = True,
         autodefer: bool | AutodeferMode = True,
         default_permissions: hikari.Permissions | hikari.UndefinedType = hikari.UNDEFINED,
+        integration_types: t.Sequence[hikari.ApplicationIntegrationType] = [
+            hikari.ApplicationIntegrationType.GUILD_INSTALL
+        ],
+        invocation_contexts: t.Sequence[hikari.ApplicationContextType] = [
+            hikari.ApplicationContextType.GUILD,
+            hikari.ApplicationContextType.PRIVATE_CHANNEL,
+            hikari.ApplicationContextType.BOT_DM,
+        ],
         is_nsfw: bool = False,
-        is_dm_enabled: bool = True,
         provided_locales: t.Sequence[hikari.Locale] | None = None,
         injector: alluka.abc.Client | None = None,
     ) -> None:
@@ -249,7 +270,8 @@ class RESTClientBase(Client[RESTBotT]):
             autodefer=autodefer,
             default_permissions=default_permissions,
             is_nsfw=is_nsfw,
-            is_dm_enabled=is_dm_enabled,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             provided_locales=provided_locales,
             injector=injector,
         )
@@ -335,12 +357,15 @@ class GatewayClient(GatewayClientBase[hikari.GatewayBotAware]):
     is_nsfw : bool
         Whether commands are NSFW
         This applies to all commands, and can be overridden on a per-command basis.
-    is_dm_enabled : bool
-        Whether commands are enabled in DMs
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType]
+        The integration types that commands will support the installation of
         This applies to all commands, and can be overridden on a per-command basis.
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType]
+        The context types that commands can be invoked in
+        This applies to all commands, and can be overridden on a per-command basis
     provided_locales : t.Sequence[hikari.Locale] | None
         The locales that will be provided to the client by locale provider callbacks
-    injector : alluka.abc.Client | None
+    injector : alluka.Client | None
         If you already have an injector instance, you may pass it here.
         Otherwise, a new one will be created by default.
 
@@ -380,9 +405,12 @@ class RESTClient(RESTClientBase[hikari.RESTBotAware]):
     is_nsfw : bool
         Whether commands are NSFW
         This applies to all commands, and can be overridden on a per-command basis.
-    is_dm_enabled : bool
-        Whether commands are enabled in DMs
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType]
+        The integration types that commands will support the installation of
         This applies to all commands, and can be overridden on a per-command basis.
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType]
+        The context types that commands can be invoked in
+        This applies to all commands, and can be overridden on a per-command basis
     provided_locales : t.Sequence[hikari.Locale] | None
         The locales that will be provided to the client by locale provider callbacks
     injector : alluka.abc.Client | None

arc/command/__init__.py

@@ -10,6 +10,8 @@ from .option import (
     ColorParams,
     ColourOption,
     ColourParams,
+    EmojiOption,
+    EmojiParams,
     FloatOption,
     FloatParams,
     IntOption,
@@ -37,41 +39,43 @@ from .slash import (
 from .user import UserCommand, user_command
 
 __all__ = (
-    "SlashCommand",
-    "SlashCommandLike",
-    "SlashGroup",
-    "SlashSubCommand",
-    "SlashSubGroup",
-    "slash_command",
-    "slash_subcommand",
+    "AttachmentOption",
+    "AttachmentParams",
     "BoolOption",
     "BoolParams",
-    "IntOption",
-    "StrOption",
-    "IntParams",
-    "StrParams",
-    "FloatOption",
-    "FloatParams",
-    "UserOption",
-    "UserParams",
     "ChannelOption",
     "ChannelParams",
-    "RoleOption",
-    "RoleParams",
-    "MentionableOption",
-    "MentionableParams",
-    "AttachmentOption",
-    "AttachmentParams",
-    "MemberOption",
-    "MemberParams",
     "ColorOption",
     "ColorParams",
     "ColourOption",
     "ColourParams",
-    "UserCommand",
-    "user_command",
+    "EmojiOption",
+    "EmojiParams",
+    "FloatOption",
+    "FloatParams",
+    "IntOption",
+    "IntParams",
+    "MemberOption",
+    "MemberParams",
+    "MentionableOption",
+    "MentionableParams",
     "MessageCommand",
+    "RoleOption",
+    "RoleParams",
+    "SlashCommand",
+    "SlashCommandLike",
+    "SlashGroup",
+    "SlashSubCommand",
+    "SlashSubGroup",
+    "StrOption",
+    "StrParams",
+    "UserCommand",
+    "UserOption",
+    "UserParams",
     "message_command",
+    "slash_command",
+    "slash_subcommand",
+    "user_command",
 )
 
 # MIT License

arc/command/message.py

@@ -45,9 +45,10 @@ class MessageCommand(CallableCommandBase[ClientT, hikari.api.ContextMenuCommandB
             id=id,
             type=self.command_type,
             default_member_permissions=self.default_permissions,
-            is_dm_enabled=self.is_dm_enabled,
+            context_types=self.invocation_contexts,
+            integration_types=self.integration_types,
             is_nsfw=self.is_nsfw,
-            name_localizations=self.name_localizations,  # pyright: ignore reportGeneralTypeIssues
+            name_localizations={str(key): value for key, value in self.name_localizations.items()},
         )
 
     async def invoke(
@@ -67,7 +68,8 @@ def message_command(
     name: str,
     *,
     guilds: t.Sequence[hikari.PartialGuild | hikari.Snowflakeish] | hikari.UndefinedType = hikari.UNDEFINED,
-    is_dm_enabled: bool | hikari.UndefinedType = hikari.UNDEFINED,
+    integration_types: t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType = hikari.UNDEFINED,
+    invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType = hikari.UNDEFINED,
     is_nsfw: bool | hikari.UndefinedType = hikari.UNDEFINED,
     autodefer: bool | AutodeferMode | hikari.UndefinedType = hikari.UNDEFINED,
     default_permissions: hikari.Permissions | hikari.UndefinedType = hikari.UNDEFINED,
@@ -84,8 +86,10 @@ def message_command(
         The name of the command.
     guilds : t.Sequence[hikari.PartialGuild | hikari.Snowflakeish] | hikari.UndefinedType
         The guilds this command should be enabled in, if left as undefined, the command is global
-    is_dm_enabled : bool | hikari.UndefinedType
-        Whether this command is enabled in DMs.
+    integration_types : t.Sequence[hikari.ApplicationIntegrationType] | hikari.UndefinedType
+        The integration types this command supports the installation of
+    invocation_contexts : t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType
+        The context types this command can be invoked in
     is_nsfw : bool | hikari.UndefinedType
         Whether this command is NSFW.
     autodefer : bool | AutodeferMode | hikari.UndefinedType
@@ -116,7 +120,8 @@ def message_command(
             name=name,
             autodefer=AutodeferMode(autodefer) if isinstance(autodefer, bool) else autodefer,
             guilds=guild_ids,
-            is_dm_enabled=is_dm_enabled,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             is_nsfw=is_nsfw,
             default_permissions=default_permissions,
             name_localizations=name_localizations or {},

arc/command/option/__init__.py

@@ -1,7 +1,16 @@
 from .attachment import AttachmentOption, AttachmentParams
 from .bool import BoolOption, BoolParams
 from .channel import ChannelOption, ChannelParams
-from .custom import ColorOption, ColorParams, ColourOption, ColourParams, MemberOption, MemberParams
+from .custom import (
+    ColorOption,
+    ColorParams,
+    ColourOption,
+    ColourParams,
+    EmojiOption,
+    EmojiParams,
+    MemberOption,
+    MemberParams,
+)
 from .float import FloatOption, FloatParams
 from .int import IntOption, IntParams
 from .mentionable import MentionableOption, MentionableParams
@@ -10,30 +19,32 @@ from .str import StrOption, StrParams
 from .user import UserOption, UserParams
 
 __all__ = (
+    "AttachmentOption",
+    "AttachmentParams",
     "BoolOption",
     "BoolParams",
-    "IntOption",
-    "IntParams",
-    "StrOption",
-    "StrParams",
-    "FloatOption",
-    "FloatParams",
-    "UserOption",
-    "UserParams",
     "ChannelOption",
     "ChannelParams",
-    "RoleOption",
-    "RoleParams",
-    "MentionableOption",
-    "MentionableParams",
-    "AttachmentOption",
-    "AttachmentParams",
-    "MemberOption",
-    "MemberParams",
     "ColorOption",
     "ColorParams",
     "ColourOption",
     "ColourParams",
+    "EmojiOption",
+    "EmojiParams",
+    "FloatOption",
+    "FloatParams",
+    "IntOption",
+    "IntParams",
+    "MemberOption",
+    "MemberParams",
+    "MentionableOption",
+    "MentionableParams",
+    "RoleOption",
+    "RoleParams",
+    "StrOption",
+    "StrParams",
+    "UserOption",
+    "UserParams",
 )
 
 # MIT License

arc/command/option/custom/__init__.py

@@ -1,4 +1,14 @@
 from .color import ColorOption, ColorParams, ColourOption, ColourParams
+from .emoji import EmojiOption, EmojiParams
 from .member import MemberOption, MemberParams
 
-__all__ = ("ColorOption", "ColorParams", "ColourOption", "ColourParams", "MemberOption", "MemberParams")
+__all__ = (
+    "ColorOption",
+    "ColorParams",
+    "ColourOption",
+    "ColourParams",
+    "EmojiOption",
+    "EmojiParams",
+    "MemberOption",
+    "MemberParams",
+)