hikari-arc 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

arc/client.py

@@ -125,11 +125,11 @@ class GatewayClientBase(Client[GatewayBotT]):
 
     async def _on_gatewaybot_startup(self, event: hikari.StartedEvent) -> None:
         await self._on_startup()
-        await self.app.event_manager.dispatch(StartedEvent(self))
+        self.app.event_manager.dispatch(StartedEvent(self), return_tasks=False)
 
     async def _on_gatewaybot_shutdown(self, event: hikari.StoppingEvent) -> None:
         await self._on_shutdown()
-        await self.app.event_manager.dispatch(StoppingEvent(self))
+        self.app.event_manager.dispatch(StoppingEvent(self), return_tasks=False)
 
     async def _on_gatewaybot_interaction_create(self, event: hikari.InteractionCreateEvent) -> None:
         if isinstance(event.interaction, hikari.CommandInteraction):
@@ -141,7 +141,7 @@ class GatewayClientBase(Client[GatewayBotT]):
         if not self.app.event_manager.get_listeners(CommandErrorEvent):
             return await super()._on_error(ctx, exception)
 
-        self.app.event_manager.dispatch(CommandErrorEvent(self, ctx, exception))
+        self.app.event_manager.dispatch(CommandErrorEvent(self, ctx, exception), return_tasks=False)
 
     def subscribe(self, event_type: type[EventT], callback: EventCallbackT[EventT]) -> None:
         """Subscribe to an event.

arc/command/option/custom/emoji.py

@@ -55,7 +55,7 @@ class EmojiOption(ConverterOption[hikari.Emoji, ClientT, EmojiParams, str]):
             return hikari.Emoji.parse(value)
         except ValueError as exc:
             raise OptionConverterFailureError(
-                self, value, f"Option '{self.name}' expected a valid color, got {value!r}."
+                self, value, f"Option '{self.name}' expected a valid emoji, got {value!r}."
             ) from exc
 
     @classmethod

arc/command/slash.py

@@ -13,7 +13,7 @@ from arc.errors import AutocompleteError, CommandInvokeError
 from arc.internal.options import resolve_options
 from arc.internal.sigparse import parse_command_signature
 from arc.internal.types import ClientT, CommandCallbackT, HookT, PostHookT, ResponseBuilderT, SlashCommandLike
-from arc.locale import CommandLocaleRequest, LocaleResponse
+from arc.locale import CommandLocaleRequest
 
 if t.TYPE_CHECKING:
     from asyncio.futures import Future
@@ -183,10 +183,13 @@ class SlashCommand(CallableCommandBase[ClientT, hikari.api.SlashCommandBuilder])
 
     def _request_command_locale(self) -> None:
         """Request the locale for this command."""
-        if self.name_localizations or self.description_localizations or self._client is None:
+        if self._client is None or not self._client._provided_locales or not self._client._command_locale_provider:
             return
 
-        if not self._client._provided_locales or not self._client._command_locale_provider:
+        for option in self.options.values():
+            option._request_option_locale(self._client, self)
+
+        if self.name_localizations or self.description_localizations:
             return
 
         name_locales: dict[hikari.Locale, str] = {}
@@ -196,8 +199,6 @@ class SlashCommand(CallableCommandBase[ClientT, hikari.api.SlashCommandBuilder])
             request = CommandLocaleRequest(self, locale, self.name)
             resp = self._client._command_locale_provider(request)
 
-            assert isinstance(resp, LocaleResponse)
-
             if resp.name is not None and resp.description is not None:
                 name_locales[locale] = resp.name
                 desc_locales[locale] = resp.description
@@ -205,9 +206,6 @@ class SlashCommand(CallableCommandBase[ClientT, hikari.api.SlashCommandBuilder])
         self.name_localizations: t.Mapping[hikari.Locale, str] = name_locales
         self.description_localizations: t.Mapping[hikari.Locale, str] = desc_locales
 
-        for option in self.options.values():
-            option._request_option_locale(self._client, self)
-
 
 @attr.define(slots=True, kw_only=True)
 class SlashGroup(CommandBase[ClientT, hikari.api.SlashCommandBuilder]):
@@ -387,6 +385,9 @@ class SlashGroup(CommandBase[ClientT, hikari.api.SlashCommandBuilder]):
         if self.name_localizations or self.description_localizations or self._client is None:
             return
 
+        for sub in self.children.values():
+            sub._request_command_locale(self._client)
+
         if not self._client._provided_locales or not self._client._command_locale_provider:
             return
 
@@ -404,9 +405,6 @@ class SlashGroup(CommandBase[ClientT, hikari.api.SlashCommandBuilder]):
         self.name_localizations: t.Mapping[hikari.Locale, str] = name_locales
         self.description_localizations: t.Mapping[hikari.Locale, str] = desc_locales
 
-        for sub in self.children.values():
-            sub._request_option_locale(self._client, self)
-
     @t.overload
     def include(self) -> t.Callable[[SlashSubCommand[ClientT]], SlashSubCommand[ClientT]]: ...
 
@@ -551,11 +549,32 @@ class SlashSubGroup(SubCommandBase[ClientT, SlashGroup[ClientT]]):
             assert self._parent is not None
             await self._parent._handle_exception(ctx, exc)
 
-    def _request_option_locale(self, client: Client[t.Any], command: CommandProto) -> None:
-        super()._request_option_locale(client, command)
+    def _request_command_locale(self, client: Client[t.Any]) -> None:
+        if not client._provided_locales or not client._command_locale_provider:
+            return
+
+        for sub in self.children.values():
+            sub._request_command_locale(client)
+
+        if self.name_localizations or self.description_localizations:
+            return
+
+        name_locales = {}
+        desc_locales = {}
+
+        for locale in client._provided_locales:
+            request = CommandLocaleRequest(self, locale, self.name)
+            resp = client._command_locale_provider(request)
+
+            if resp.name is not None and resp.description is not None:
+                name_locales[locale] = resp.name
+                desc_locales[locale] = resp.description
+
+        self.name_localizations: t.Mapping[hikari.Locale, str] = name_locales
+        self.description_localizations: t.Mapping[hikari.Locale, str] = desc_locales
 
-        for subcommand in self.children.values():
-            subcommand._request_option_locale(client, command)
+    def _request_option_locale(self, client: Client[t.Any], command: CommandProto) -> None:
+        raise RuntimeError("_request_option_locale should not be called on a subgroup. (This is a bug)")
 
     @t.overload
     def include(self) -> t.Callable[[SlashSubCommand[ClientT]], SlashSubCommand[ClientT]]: ...
@@ -705,11 +724,32 @@ class SlashSubCommand(
             assert self._parent is not None
             await self._parent._handle_exception(ctx, e)
 
-    def _request_option_locale(self, client: Client[t.Any], command: CommandProto) -> None:
-        super()._request_option_locale(client, command)
+    def _request_command_locale(self, client: Client[t.Any]) -> None:
+        if not client._provided_locales or not client._command_locale_provider:
+            return
 
         for option in self.options.values():
-            option._request_option_locale(client, command)
+            option._request_option_locale(client, self)
+
+        if self.name_localizations or self.description_localizations:
+            return
+
+        name_locales = {}
+        desc_locales = {}
+
+        for locale in client._provided_locales:
+            request = CommandLocaleRequest(self, locale, self.name)
+            resp = client._command_locale_provider(request)
+
+            if resp.name is not None and resp.description is not None:
+                name_locales[locale] = resp.name
+                desc_locales[locale] = resp.description
+
+        self.name_localizations: t.Mapping[hikari.Locale, str] = name_locales
+        self.description_localizations: t.Mapping[hikari.Locale, str] = desc_locales
+
+    def _request_option_locale(self, client: Client[t.Any], command: CommandProto) -> None:
+        raise RuntimeError("_request_option_locale should not be called on a subcommand. (This is a bug)")
 
     async def __call__(self, ctx: Context[ClientT], *args: t.Any, **kwargs: t.Any) -> None:
         """Invoke this subcommand with the given context.

arc/internal/about.py

@@ -1,6 +1,6 @@
 import typing as t
 
-__version__: t.Final[str] = "2.1.0"
+__version__: t.Final[str] = "2.2.0"
 
 # MIT License
 #

{hikari_arc-2.1.0.dist-info → hikari_arc-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hikari-arc
-Version: 2.1.0
+Version: 2.2.0
 Summary: A command handler for hikari with a focus on type-safety and correctness.
 Project-URL: Homepage, https://arc.hypergonial.com
 Project-URL: Documentation, https://arc.hypergonial.com
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
@@ -27,12 +28,12 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: alluka<0.4,>=0.3.3
 Requires-Dist: attrs>=25.3.0
-Requires-Dist: hikari>=2.2.1
+Requires-Dist: hikari>=2.3.3
 Provides-Extra: cron
 Requires-Dist: croniter==5.0.1; extra == 'cron'
 Requires-Dist: types-croniter==5.0.1.20241205; extra == 'cron'
 Provides-Extra: rest
-Requires-Dist: hikari[server]>=2.2.1; extra == 'rest'
+Requires-Dist: hikari[server]>=2.3.3; extra == 'rest'
 Description-Content-Type: text/markdown
 
 <div align="center">

{hikari_arc-2.1.0.dist-info → hikari_arc-2.2.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 arc/__init__.py,sha256=rkJuU9fFg1c2xZ6xFx60rzdL6gmkIcjl5KTc42IoIEc,5899
 arc/__main__.py,sha256=ClAG2bqkzmJfKrEMYTVzi0O5--8eY_QFuNAqsMmwVQY,2012
-arc/client.py,sha256=nTu2wqB0En_Y1IkNZAsShCaC8MYtC0m235S8WxrUiTo,19828
+arc/client.py,sha256=jMcCfFcz8TAarUCmNvhxmmQdPJXPQ1hpvwkvaHWSL9U,19876
 arc/errors.py,sha256=_RLNY-iivsbogHlv_ofSU8TwoIewOGZ_ruf6EKtPvbY,6802
 arc/events.py,sha256=WRXTLH9PBwU4GTu5rZS5AJ4fNxhDgSD9Rx3M-02FcDQ,2782
 arc/extension.py,sha256=UgtORuV7D3_zUHG1LGXrnhHvz8nntxHRncMrxleoPM0,3371
@@ -18,7 +18,7 @@ arc/abc/option.py,sha256=VHMXXXy4y2xTGErFDv47tWA2gDXYbHV4IPE5xFpqh0w,13157
 arc/abc/plugin.py,sha256=xzVFxz-2PEbJxIbarlR-wOuw0IoaPNE14p3FgShMTeI,22589
 arc/command/__init__.py,sha256=Y9L-vVEcDYUpQb4AngH3QjamZY-OtSbdIENBqQ78fA0,2614
 arc/command/message.py,sha256=1aKF-Rfyk-z2T8wdW5paQtnZKaUJTMkSjM_wity1vqQ,6437
-arc/command/slash.py,sha256=jldzFLEcX_jNn6_07Ht4ZvcqrYEBheAGFR_ViE5aMKQ,36193
+arc/command/slash.py,sha256=ZBjVjvRdB4bVFJCmDqVStM5GGiFzFEgGzVEVwthCBhs,37856
 arc/command/user.py,sha256=CVGGtLN0zqG4RCcva7dEm_T4Mc67vqEfxSk8W33vHPc,6489
 arc/command/option/__init__.py,sha256=BCNSEHiifoYZdm24zjfIP5POELImLBbtft-8oDxysPI,2218
 arc/command/option/attachment.py,sha256=N9DEVg3zO8hcJbU2fQyJGARfJl1DZQSd_7T5tX3Bxts,3004
@@ -32,14 +32,14 @@ arc/command/option/str.py,sha256=ua-HXYjklptjkL9IXZazzY1lbREPPwydInwJGM6BcDY,526
 arc/command/option/user.py,sha256=Qf9dqqmsSPB-yBjT4qAupKRfF1UHh9P3rKXZnRahFYE,2922
 arc/command/option/custom/__init__.py,sha256=dffcEAj7UnjNI1LUuKOCyEEu23AeCFXQY3ay3XKArhQ,334
 arc/command/option/custom/color.py,sha256=eBO85edOVztUu_m5kdvVGm0XYUVl9bpmWYTWizzOnTo,3474
-arc/command/option/custom/emoji.py,sha256=YcgZeGCDUDRavmacw9OSOo8GD5ChyT1K7a3qHPqvbZg,3302
+arc/command/option/custom/emoji.py,sha256=-1axRfS3eaAQOHlzsvflriQqPQe_WKAcOxsn8XFOVZo,3302
 arc/command/option/custom/member.py,sha256=Jjn0ZWex6fv9x1iSUqcyFSAr90Oq8cK6OFCIQcr5HHA,3338
 arc/context/__init__.py,sha256=5M-6ZkBv3pJf3_TY8ckzcAXIxVh-5VgXxoRjPvuy_Go,1303
 arc/context/autocomplete.py,sha256=lBPFZWW1XSFPndo0uz8Q3vgovNelrLWNU5ks059zORY,4423
 arc/context/base.py,sha256=U78_5LeHK986k5pZ9Tp0xx3ySQ2Ojilt068zfp1zFzI,42541
 arc/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arc/internal/__init__.py,sha256=vKFwSbAXp509-QtHo42xkv4sfONNhuW5foSxesrNPUc,1261
-arc/internal/about.py,sha256=ksMs_fWarWOxJygC9gj38ee7YvJos78P6vOauWbLlKY,1171
+arc/internal/about.py,sha256=ZRB1XCpOSepiPM4fmIZ4oRRMUUOK6ndb6SoBN4IhvRY,1171
 arc/internal/deprecation.py,sha256=Lnirv1z_oj6QJvbnd38TwHQnhHhFD2rTqqvH96pxiWE,2204
 arc/internal/options.py,sha256=4Z56tG7gxpMR4wCgno85dD23-62GfFnidZsFlHvYp7c,3658
 arc/internal/sigparse.py,sha256=-Arw1lvoHJzlr53ydk8PvNQU0dSOXGA5dQ1r1GL3EMk,13613
@@ -53,7 +53,7 @@ arc/utils/ratelimiter.py,sha256=tnFORqGerByEiBGesiRGO19NSjCBXTzvDhkLb8Of4yU,9477
 arc/utils/hooks/__init__.py,sha256=llFi42mb-LH9VS0Ah9Z7E-bZq4Wneb2vHwY1LTFcEUI,515
 arc/utils/hooks/basic.py,sha256=5dl3lQ--Sytn9CdlDntDvTepFBOuFngC8J4buDsd6hY,5790
 arc/utils/hooks/limiters.py,sha256=64PyJHPIii2R9cbHA9MIOCfkIg99lGOGWrhGNuP5jHE,7490
-hikari_arc-2.1.0.dist-info/METADATA,sha256=gBBrq50WqP5bWPLWxIyIgGvhq7JPlndBOW1v58-PccM,5447
-hikari_arc-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hikari_arc-2.1.0.dist-info/licenses/LICENSE,sha256=q_osUjCCfQVI7zzgteLMZ-RlhXlB4rqQE8I0DGh7ur4,1076
-hikari_arc-2.1.0.dist-info/RECORD,,
+hikari_arc-2.2.0.dist-info/METADATA,sha256=oL7zzF91QI7FjRDT4fN0C4foEgkeOu7L9ns-Jm79zw0,5498
+hikari_arc-2.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hikari_arc-2.2.0.dist-info/licenses/LICENSE,sha256=q_osUjCCfQVI7zzgteLMZ-RlhXlB4rqQE8I0DGh7ur4,1076
+hikari_arc-2.2.0.dist-info/RECORD,,

{hikari_arc-2.1.0.dist-info → hikari_arc-2.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any