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

arc/command/slash.py

@@ -25,8 +25,8 @@ if t.TYPE_CHECKING:
     from arc.abc.plugin import PluginBase
 
 __all__ = (
-    "SlashCommandLike",
     "SlashCommand",
+    "SlashCommandLike",
     "SlashGroup",
     "SlashSubCommand",
     "SlashSubGroup",
@@ -108,7 +108,8 @@ class SlashCommand(CallableCommandBase[ClientT, hikari.api.SlashCommandBuilder])
             id=id,
             options=[option.to_command_option() for option in self.options.values()],
             default_member_permissions=self.default_permissions,
-            is_dm_enabled=self.is_dm_enabled,
+            integration_types=self.integration_types,
+            context_types=self.invocation_contexts,
             is_nsfw=self.is_nsfw,
             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()},
@@ -263,7 +264,8 @@ class SlashGroup(CommandBase[ClientT, hikari.api.SlashCommandBuilder]):
             id=id,
             options=[subcmd.to_command_option() for subcmd in self.children.values()],
             default_member_permissions=self.default_permissions,
-            is_dm_enabled=self.is_dm_enabled,
+            integration_types=self.integration_types,
+            context_types=self.invocation_contexts,
             is_nsfw=self.is_nsfw,
             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()},
@@ -363,7 +365,7 @@ class SlashGroup(CommandBase[ClientT, hikari.api.SlashCommandBuilder]):
             opt = next(o for o in subsub.options if o.name in subsubcmd.options and o.is_focused)
             local_opt = subsubcmd.options[opt.name]
 
-        if not isinstance(local_opt, OptionWithChoices) or not local_opt.autocomplete_with:
+        if not isinstance(local_opt, OptionWithChoices) or not local_opt.autocomplete_with:  # pyright: ignore reportUnknownMemberType
             raise AutocompleteError(
                 f"Slash option got autocomplete interaction without autocomplete callback: '{local_opt.name}'."
             )
@@ -522,7 +524,8 @@ class SlashSubGroup(SubCommandBase[ClientT, SlashGroup[ClientT]]):
                 autodefer=self._autodefer,
                 default_permissions=hikari.UNDEFINED,
                 is_nsfw=hikari.UNDEFINED,
-                is_dm_enabled=hikari.UNDEFINED,
+                integration_types=hikari.UNDEFINED,
+                invocation_contexts=hikari.UNDEFINED,
             )
         )
 
@@ -675,7 +678,8 @@ class SlashSubCommand(
                 autodefer=self._autodefer,
                 default_permissions=hikari.UNDEFINED,
                 is_nsfw=hikari.UNDEFINED,
-                is_dm_enabled=hikari.UNDEFINED,
+                integration_types=hikari.UNDEFINED,
+                invocation_contexts=hikari.UNDEFINED,
             )
         )
 
@@ -739,7 +743,8 @@ def slash_command(
     description: str = "No description provided.",
     *,
     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,
@@ -756,8 +761,10 @@ def slash_command(
         The description 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
-        If True, the command is usable in direct messages
+    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
         If True, the command is only usable in NSFW channels
     autodefer : bool | AutodeferMode | hikari.UndefinedType
@@ -804,7 +811,8 @@ def slash_command(
             description_localizations=description_localizations or {},
             default_permissions=default_permissions,
             guilds=guild_ids,
-            is_dm_enabled=is_dm_enabled,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             is_nsfw=is_nsfw,
         )
 

arc/command/user.py

@@ -46,7 +46,8 @@ class UserCommand(CallableCommandBase[ClientT, hikari.api.ContextMenuCommandBuil
             type=self.command_type,
             id=id,
             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={str(key): value for key, value in self.name_localizations.items()},
         )
@@ -70,7 +71,8 @@ def user_command(
     name: str,
     *,
     guilds: t.Sequence[hikari.PartialGuild | hikari.Snowflakeish] | hikari.UndefinedType = hikari.UNDEFINED,
-    is_dm_enabled: bool | hikari.UndefinedType = hikari.UNDEFINED,
+    invocation_contexts: t.Sequence[hikari.ApplicationContextType] | hikari.UndefinedType = hikari.UNDEFINED,
+    integration_types: t.Sequence[hikari.ApplicationIntegrationType] | 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,
@@ -87,8 +89,10 @@ def user_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
@@ -117,7 +121,8 @@ def user_command(
             name=name,
             autodefer=AutodeferMode(autodefer) if isinstance(autodefer, bool) else autodefer,
             guilds=guild_ids,
-            is_dm_enabled=is_dm_enabled,
+            invocation_contexts=invocation_contexts,
+            integration_types=integration_types,
             is_nsfw=is_nsfw,
             default_permissions=default_permissions,
             name_localizations=name_localizations or {},

arc/context/__init__.py

@@ -1,7 +1,7 @@
 from .autocomplete import AutocompleteData
 from .base import AutodeferMode, Context, InteractionResponse
 
-__all__ = ("Context", "InteractionResponse", "AutocompleteData", "AutodeferMode")
+__all__ = ("AutocompleteData", "AutodeferMode", "Context", "InteractionResponse")
 
 # MIT License
 #

arc/context/autocomplete.py

@@ -51,7 +51,7 @@ class AutocompleteData(t.Generic[ClientT, ChoiceT]):
         """
         if self.focused_option is None:
             return None
-        return t.cast(ChoiceT | str, self.focused_option.value)
+        return t.cast("ChoiceT | str", self.focused_option.value)
 
     @property
     def guild_id(self) -> hikari.Snowflake | None:
@@ -68,19 +68,33 @@ class AutocompleteData(t.Generic[ClientT, ChoiceT]):
         """The member that triggered the interaction."""
         return self.interaction.member
 
+    @property
+    def invocation_context(self) -> hikari.ApplicationContextType:
+        """The context in which the interaction was invoked."""
+        return self.interaction.context
+
+    @property
+    def authorizing_integration_owners(self) -> t.Mapping[hikari.ApplicationIntegrationType, hikari.Snowflake]:
+        """Includes details about the authorizing user or server for the installation(s) relevant to the interaction.
+
+        For apps installed to a user, it can be used to tell the difference between the authorizing user
+        and the user that triggered an interaction (like a message component).
+        """
+        return self.interaction.authorizing_integration_owners
+
     @property
     def user(self) -> hikari.User:
         """The user that triggered the interaction."""
         return self.interaction.user
 
+    @property
+    def channel(self) -> hikari.InteractionChannel:
+        return self.interaction.channel
+
     def get_guild(self) -> hikari.Guild | None:
         """Get the guild that triggered the interaction."""
         return self.interaction.get_guild()
 
-    def get_channel(self) -> hikari.TextableGuildChannel | None:
-        """Get the channel that triggered the interaction."""
-        return self.interaction.get_channel()
-
 
 # MIT License
 #

arc/context/base.py

@@ -11,7 +11,7 @@ import alluka
 import attr
 import hikari
 
-from arc.abc.option import OptionType  # noqa: TCH001 Needed for tests
+from arc.abc.option import OptionType  # noqa: TC001 Needed for tests
 from arc.errors import NoResponseIssuedError, ResponseAlreadyIssuedError
 from arc.internal.options import OPTIONTYPE_TO_TYPE, resolve_snowflake_value
 from arc.internal.types import ClientT, ResponseBuilderT
@@ -20,7 +20,7 @@ from arc.locale import CustomLocaleRequest
 if t.TYPE_CHECKING:
     from arc.abc.command import CallableCommandProto
 
-__all__ = ("Context", "InteractionResponse", "AutodeferMode")
+__all__ = ("AutodeferMode", "Context", "InteractionResponse")
 
 logger = logging.getLogger(__name__)
 
@@ -105,7 +105,7 @@ class InteractionResponse:
     when a message response is issued.
     """
 
-    __slots__ = ("_context", "_message", "_delete_after_task")
+    __slots__ = ("_context", "_delete_after_task", "_message")
 
     def __init__(self, context: Context[t.Any], message: hikari.Message | None = None) -> None:
         self._context: Context[t.Any] = context
@@ -247,18 +247,18 @@ class Context(t.Generic[ClientT]):
     """A context object that is proxying a Discord command interaction."""
 
     __slots__ = (
+        "_autodefer_task",
         "_client",
         "_command",
-        "_interaction",
-        "_responses",
-        "_resp_builder",
-        "_issued_response",
-        "_response_lock",
-        "_autodefer_task",
         "_created_at",
         "_has_command_failed",
-        "_options",
         "_injection_ctx",
+        "_interaction",
+        "_issued_response",
+        "_options",
+        "_resp_builder",
+        "_response_lock",
+        "_responses",
     )
 
     def __init__(
@@ -341,11 +341,69 @@ class Context(t.Generic[ClientT]):
         """The ID of the channel the context represents."""
         return self._interaction.channel_id
 
+    @property
+    def channel(self) -> hikari.InteractionChannel:
+        """The channel the context represents."""
+        return self._interaction.channel
+
     @property
     def guild_id(self) -> hikari.Snowflake | None:
         """The ID of the guild the context represents. Will be None in DMs."""
         return self._interaction.guild_id
 
+    @property
+    def invocation_context(self) -> hikari.ApplicationContextType:
+        """The context in which the interaction was invoked.
+
+        This can be used to determine if the command was invoked in DMs, a guild, or a group DM.
+        """
+        return self._interaction.context
+
+    @property
+    def authorizing_integration_owners(self) -> t.Mapping[hikari.ApplicationIntegrationType, hikari.Snowflake]:
+        """Includes details about the authorizing user or guild for the installation(s) relevant to the interaction.
+
+        For apps installed to a user, it can be used to tell the difference between the authorizing user
+        and the user that triggered an interaction.
+        """
+        return self._interaction.authorizing_integration_owners
+
+    @property
+    def authorizing_guild_id(self) -> hikari.Snowflake | None:
+        """The ID of the guild that this command was installed in.
+
+        This will be `None` if the command was not installed in the guild.
+
+        This is a shorthand for
+
+        ```
+        authorizing_integration_owners.get(hikari.ApplicationIntegrationType.GUILD_INSTALL)
+        ```
+
+        !!! note
+            It is possible for both this value and `authorizing_user_id` to not be `None`, if the command is installed
+            in both a guild and by a user.
+        """
+        return self._interaction.authorizing_integration_owners.get(hikari.ApplicationIntegrationType.GUILD_INSTALL)
+
+    @property
+    def authorizing_user_id(self) -> hikari.Snowflake | None:
+        """The ID of the user that installed this command.
+
+        This will be `None` if the command was not installed by a user.
+
+        This is a shorthand for
+
+        ```
+        authorizing_integration_owners.get(hikari.ApplicationIntegrationType.USER_INSTALL)
+        ```
+
+        !!! note
+            It is possible for both this value and `authorizing_guild_id` to not be `None`, if the command is installed
+            in both a guild and by a user.
+        """
+        return self._interaction.authorizing_integration_owners.get(hikari.ApplicationIntegrationType.USER_INSTALL)
+
     @property
     def is_valid(self) -> bool:
         """Returns if the underlying interaction expired or not.
@@ -414,10 +472,6 @@ class Context(t.Generic[ClientT]):
         """Gets the guild this context represents, if any. Requires application cache."""
         return self._interaction.get_guild()
 
-    def get_channel(self) -> hikari.TextableGuildChannel | None:
-        """Gets the channel this context represents, None if in a DM. Requires application cache."""
-        return self._interaction.get_channel()
-
     @t.overload
     def get_option(self, name: str, opt_type: t.Literal[OptionType.EMOJI]) -> hikari.Emoji | None: ...
 

arc/internal/__init__.py

@@ -1,16 +1,7 @@
-from .about import __author__, __author_email__, __maintainer__, __version__
 from .deprecation import warn_deprecate
 from .version import CURRENT_VERSION, Version
 
-__all__ = (
-    "warn_deprecate",
-    "Version",
-    "CURRENT_VERSION",
-    "__author__",
-    "__author_email__",
-    "__maintainer__",
-    "__version__",
-)
+__all__ = ("CURRENT_VERSION", "Version", "warn_deprecate")
 
 # MIT License
 #

arc/internal/about.py

@@ -1,11 +1,6 @@
 import typing as t
 
-__author__: t.Final[str] = "hypergonial"
-__author_email__: t.Final[str] = "git@hypergonial.com"
-__maintainer__: t.Final[str] = "hypergonial"
-__license__: t.Final[str] = "MIT"
-__url__: t.Final[str] = "https://github.com/hypergonial/hikari-arc"
-__version__: t.Final[str] = "1.4.0"
+__version__: t.Final[str] = "2.0.0"
 
 # MIT License
 #

arc/internal/sync.py

@@ -50,8 +50,9 @@ def _rebuild_hikari_command(
             description=command.description,
             options=list(command.options) if command.options else [],
             default_member_permissions=command.default_member_permissions,
-            is_dm_enabled=command.is_dm_enabled,
             is_nsfw=command.is_nsfw,
+            integration_types=command.integration_types,
+            context_types=command.context_types,
             name_localizations=command.name_localizations,
             description_localizations=command.description_localizations,
         )
@@ -61,8 +62,9 @@ def _rebuild_hikari_command(
             id=command.id,
             type=command.type,
             default_member_permissions=command.default_member_permissions,
-            is_dm_enabled=command.is_dm_enabled,
             is_nsfw=command.is_nsfw,
+            integration_types=command.integration_types,
+            context_types=command.context_types,
             name_localizations=command.name_localizations,
         )
     else:
@@ -93,7 +95,8 @@ def _compare_commands(arc_command: CommandBase[t.Any, t.Any], hk_command: hikari
         and arc_command.name == hk_command.name
         and cmd_dict.get("description") == getattr(hk_command, "description", None)
         and arc_command.is_nsfw == hk_command.is_nsfw
-        and arc_command.is_dm_enabled == hk_command.is_dm_enabled
+        and set(arc_command.invocation_contexts) == set(hk_command.context_types)
+        and set(arc_command.integration_types) == set(hk_command.integration_types)
         and (
             hk_command.guild_id in arc_command.guilds
             if hk_command.guild_id is not None and arc_command.guilds is not hikari.UNDEFINED

arc/internal/version.py

@@ -9,7 +9,7 @@ if t.TYPE_CHECKING:
     import typing_extensions as te
 
 
-__all__ = ("Version", "CURRENT_VERSION")
+__all__ = ("CURRENT_VERSION", "Version")
 
 
 @total_ordering

arc/locale.py

@@ -14,12 +14,12 @@ if t.TYPE_CHECKING:
     from arc.context.base import Context
 
 __all__ = (
-    "LocaleRequestType",
+    "CommandLocaleRequest",
+    "CustomLocaleRequest",
     "LocaleRequest",
+    "LocaleRequestType",
     "LocaleResponse",
-    "CommandLocaleRequest",
     "OptionLocaleRequest",
-    "CustomLocaleRequest",
 )
 
 

arc/plugin.py

@@ -11,7 +11,7 @@ from arc.internal.types import EventCallbackT, EventT, GatewayClientT, RESTClien
 if t.TYPE_CHECKING:
     from arc.context.base import AutodeferMode
 
-__all__ = ("RESTPluginBase", "GatewayPluginBase")
+__all__ = ("GatewayPluginBase", "RESTPluginBase")
 
 P = t.ParamSpec("P")
 T = t.TypeVar("T")
@@ -33,8 +33,11 @@ class RESTPluginBase(PluginBase[RESTClientT]):
     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
@@ -81,8 +84,11 @@ class GatewayPluginBase(PluginBase[GatewayClientT]):
     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
@@ -115,7 +121,8 @@ class GatewayPluginBase(PluginBase[GatewayClientT]):
         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:
@@ -123,7 +130,8 @@ class GatewayPluginBase(PluginBase[GatewayClientT]):
             name=name,
             default_enabled_guilds=default_enabled_guilds,
             autodefer=autodefer,
-            is_dm_enabled=is_dm_enabled,
+            integration_types=integration_types,
+            invocation_contexts=invocation_contexts,
             default_permissions=default_permissions,
             is_nsfw=is_nsfw,
         )

arc/utils/__init__.py

@@ -26,32 +26,32 @@ from .loops import CronLoop, IntervalLoop, cron_loop, interval_loop
 from .ratelimiter import RateLimiter, RateLimiterExhaustedError
 
 __all__ = (
-    "guild_only",
-    "owner_only",
-    "dm_only",
-    "has_permissions",
-    "bot_has_permissions",
-    "global_limiter",
-    "guild_limiter",
-    "user_limiter",
-    "member_limiter",
-    "channel_limiter",
-    "custom_limiter",
+    "CommandConcurrencyLimiter",
+    "ConcurrencyLimiter",
+    "CronLoop",
+    "IntervalLoop",
     "LimiterHook",
     "RateLimiter",
     "RateLimiterExhaustedError",
-    "IntervalLoop",
-    "interval_loop",
-    "CronLoop",
+    "bot_has_permissions",
+    "channel_concurrency",
+    "channel_limiter",
     "cron_loop",
-    "CommandConcurrencyLimiter",
-    "ConcurrencyLimiter",
+    "custom_concurrency",
+    "custom_limiter",
+    "dm_only",
     "global_concurrency",
+    "global_limiter",
     "guild_concurrency",
-    "channel_concurrency",
-    "user_concurrency",
+    "guild_limiter",
+    "guild_only",
+    "has_permissions",
+    "interval_loop",
     "member_concurrency",
-    "custom_concurrency",
+    "member_limiter",
+    "owner_only",
+    "user_concurrency",
+    "user_limiter",
 )
 
 # MIT License

arc/utils/concurrency_limiter.py

@@ -9,14 +9,14 @@ from arc.context.base import Context
 from arc.internal.types import ClientT
 
 __all__ = (
-    "ConcurrencyLimiter",
     "CommandConcurrencyLimiter",
+    "ConcurrencyLimiter",
+    "channel_concurrency",
+    "custom_concurrency",
     "global_concurrency",
     "guild_concurrency",
-    "channel_concurrency",
-    "user_concurrency",
     "member_concurrency",
-    "custom_concurrency",
+    "user_concurrency",
 )
 
 KeyT = t.TypeVar("KeyT")
@@ -32,7 +32,7 @@ class _BoundedSemaphore(asyncio.BoundedSemaphore):
 class _Bucket(t.Generic[KeyT]):
     """Handles the concurrency limiting of a single item. (E.g. a single user or a channel)."""
 
-    __slots__ = ("_key", "_max_concurrent", "_semaphore", "_limiter")
+    __slots__ = ("_key", "_limiter", "_max_concurrent", "_semaphore")
 
     def __init__(self, key: str, max_concurrent: int, limiter: ConcurrencyLimiter[KeyT]) -> None:
         self._key = key
@@ -74,7 +74,7 @@ class _Bucket(t.Generic[KeyT]):
 
 
 class _ConcurrencyLimiterContextManager(t.Generic[KeyT]):
-    __slots__ = ("_limiter", "_item")
+    __slots__ = ("_item", "_limiter")
 
     def __init__(self, limiter: ConcurrencyLimiter[KeyT], item: KeyT) -> None:
         self._limiter = limiter
@@ -122,7 +122,7 @@ class ConcurrencyLimiter(t.Generic[KeyT]):
     - [`custom_concurrency()`][arc.utils.concurrency_limiter.custom_concurrency]
     """
 
-    __slots__: t.Sequence[str] = ("_capacity", "_buckets", "_get_key")
+    __slots__: t.Sequence[str] = ("_buckets", "_capacity", "_get_key")
 
     def __init__(self, capacity: int, *, get_key_with: t.Callable[[KeyT], str]) -> None:
         self._capacity = capacity

arc/utils/hooks/__init__.py

@@ -10,16 +10,16 @@ from .limiters import (
 )
 
 __all__ = (
-    "guild_only",
-    "owner_only",
-    "dm_only",
-    "has_permissions",
+    "LimiterHook",
     "bot_has_permissions",
+    "channel_limiter",
+    "custom_limiter",
+    "dm_only",
     "global_limiter",
     "guild_limiter",
-    "channel_limiter",
-    "user_limiter",
+    "guild_only",
+    "has_permissions",
     "member_limiter",
-    "custom_limiter",
-    "LimiterHook",
+    "owner_only",
+    "user_limiter",
 )

arc/utils/hooks/basic.py

@@ -5,7 +5,7 @@ import typing as t
 import hikari
 
 from arc.abc.hookable import HookResult
-from arc.context import Context  # noqa: TCH001 Needed for DI to work
+from arc.context import Context  # noqa: TC001 Needed for DI to work
 from arc.errors import (
     BotMissingPermissionsError,
     DMOnlyError,

arc/utils/hooks/limiters.py

@@ -10,12 +10,12 @@ from arc.utils.ratelimiter import RateLimiter, RateLimiterExhaustedError
 
 __all__ = (
     "LimiterHook",
+    "channel_limiter",
+    "custom_limiter",
     "global_limiter",
     "guild_limiter",
-    "channel_limiter",
-    "user_limiter",
     "member_limiter",
-    "custom_limiter",
+    "user_limiter",
 )
 
 

arc/utils/loops.py

@@ -6,7 +6,7 @@ import sys
 import traceback
 import typing as t
 
-__all__ = ("IntervalLoop", "CronLoop", "interval_loop", "cron_loop")
+__all__ = ("CronLoop", "IntervalLoop", "cron_loop", "interval_loop")
 
 P = t.ParamSpec("P")
 
@@ -25,7 +25,7 @@ class _LoopBase(abc.ABC, t.Generic[P]):
     - [`CronLoop`][arc.utils.loops.CronLoop]
     """
 
-    __slots__ = ("_coro", "_task", "_failed", "_stop_next", "_run_on_start")
+    __slots__ = ("_coro", "_failed", "_run_on_start", "_stop_next", "_task")
 
     def __init__(self, callback: t.Callable[P, t.Awaitable[None]], *, run_on_start: bool = True) -> None:
         self._coro = callback

arc/utils/ratelimiter.py

@@ -117,7 +117,7 @@ class RateLimiter(t.Generic[KeyT]):
         A callable that returns a key for the ratelimiter bucket.
     """
 
-    __slots__ = ("period", "limit", "_buckets", "_get_key", "_gc_task")
+    __slots__ = ("_buckets", "_gc_task", "_get_key", "limit", "period")
 
     def __init__(self, period: float, limit: int, *, get_key_with: t.Callable[[KeyT], str]) -> None:
         self.period: float = period