⬆️ upgrade alconna to 1.8.40

modify aliases impl

Author: RF-Tar-Railt

pdm.lock

@@ -7,7 +7,7 @@ authors = [
 dependencies = [
     "tarina<0.7,>=0.6.8",
     "nepattern<1.0,>=0.7.7",
-    "arclet-alconna<2.0,>=1.8.35",
+    "arclet-alconna<2.0,>=1.8.40",
     "arclet-alconna-tools>=0.7.10",
     "importlib-metadata>=4.13.0",
     "nonebot2>=2.3.0",

pyproject.toml

@@ -144,6 +144,7 @@ def shortcut(
         arguments: list[Any] | None = None,
         fuzzy: bool = True,
         prefix: bool = False,
+        compact: bool | None = True,
         wrapper: ShortcutRegWrapper | None = None,
         humanized: str | None = None,
     ) -> type[Self]:
@@ -155,6 +156,7 @@ def shortcut(
             arguments (list[Any] | None, optional): 快捷命令参数, 默认为 `None`
             fuzzy (bool, optional): 是否允许命令后随参数, 默认为 `True`
             prefix (bool, optional): 是否调用时保留指令前缀, 默认为 `False`
+            compact (bool, optional): 是否允许快捷指令与后随参数之间不包含分隔符，默认为 `True`. 当 compact 为 `None` 时表示跟随 CommandMeta.compact
             wrapper (ShortcutRegWrapper, optional): 快捷指令的正则匹配结果的额外处理函数, 默认为 `None`
             humanized (str, optional): 快捷指令的人类可读描述, 默认为 `None`
 
@@ -176,6 +178,7 @@ def shortcut(cls, key: str | TPattern, args: ShortcutArgs | None = None, **kwarg
             arguments (list[Any] | None, optional): 快捷命令参数, 默认为 `None`
             fuzzy (bool, optional): 是否允许命令后随参数, 默认为 `True`
             prefix (bool, optional): 是否调用时保留指令前缀, 默认为 `False`
+            compact (bool, optional): 是否允许快捷指令与后随参数之间不包含分隔符，默认为 `True`. 当 compact 为 `None` 时表示跟随 CommandMeta.compact
             wrapper (ShortcutRegWrapper, optional): 快捷指令的正则匹配结果的额外处理函数, 默认为 `None`
             humanized (str, optional): 快捷指令的人类可读描述, 默认为 `None`
 

src/nonebot_plugin_alconna/matcher.py

@@ -144,7 +144,7 @@ def _update(cmd_id: int):
         self.command = weakref.ref(command, lambda _: _update(_.__hash__()))
         if _aliases:
             for alias in _aliases:
-                command.shortcut(alias, prefix=True)
+                command.shortcut(alias, prefix=True, compact=False)
         self.skip = skip_for_unmatch
         self.executor = ExtensionExecutor(self, extensions, exclude_ext)
         self.executor.post_init(command)

src/nonebot_plugin_alconna/rule.py

@@ -0,0 +1,31 @@
+import pytest
+from nonebug import App
+from nonebot import get_adapter
+from nonebot.adapters.onebot.v11 import Bot, Adapter, Message
+
+from tests.fake import fake_group_message_event_v11
+
+
+@pytest.mark.asyncio()
+async def test_command(app: App):
+    from nonebot_plugin_alconna import Args, Alconna, on_alconna
+
+    alc = Alconna("weather", Args["city#城市名称", str])
+    matcher = on_alconna(alc, aliases={"天气"})
+
+    @matcher.handle()
+    async def _(city: str):
+        await matcher.send(city)
+
+    async with app.test_matcher(matcher) as ctx:  # type: ignore
+        adapter = get_adapter(Adapter)
+        bot = ctx.create_bot(base=Bot, adapter=adapter)
+        event = fake_group_message_event_v11(message=Message("weather abcd"), user_id=123)
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "abcd")
+        event1 = fake_group_message_event_v11(message=Message("天气 abcd"), user_id=123)
+        ctx.receive_event(bot, event1)
+        ctx.should_call_send(event1, "abcd")
+        event2 = fake_group_message_event_v11(message=Message("天气abcd"), user_id=123)
+        ctx.receive_event(bot, event2)
+        ctx.should_not_pass_rule()