🐛 fix rule order

resolve #89

Author: RF-Tar-Railt

README.md

@@ -103,7 +103,7 @@ async def _():
 - ⬇️: 支持接收
 - ⬆️: 支持发送
 - ➖: 情况不存在
-- ❌: 插件未支持
+- ❌: 插件/适配器未支持
 - 🚫: 协议未支持
 - (🚧): 计划中或部分支持或为实验性支持
 

src/nonebot_plugin_alconna/__init__.py

@@ -1,4 +1,5 @@
 import contextlib
+from typing_extensions import deprecated
 
 import nonebot
 
@@ -62,7 +63,6 @@
 from .uniseg import at_me as at_me
 from .typings import Style as Style
 from .params import assign as assign
-from .rule import alconna as alconna
 from .uniseg import Button as Button
 from .uniseg import FORBID as FORBID
 from .uniseg import IGNORE as IGNORE
@@ -91,6 +91,7 @@
 from .params import AlcMatches as AlcMatches
 from .params import AlconnaArg as AlconnaArg
 from .params import match_path as match_path
+from .rule import AlconnaRule as AlconnaRule
 from .uniseg import CustomNode as CustomNode
 from .uniseg import UniMessage as UniMessage
 from .extension import Extension as Extension
@@ -194,3 +195,8 @@ def load_builtin_plugins(*plugins: str):
         apply_fetch_targets()
     if _config.alconna_builtin_plugins:
         load_builtin_plugins(*_config.alconna_builtin_plugins)
+
+
+@deprecated("`alconna(...)` are no longer supported and will be removed in the future. Use `AlconnaRule(...)` instead.")
+def alconna(*args, **kwargs):
+    return AlconnaRule(*args, **kwargs).rule

src/nonebot_plugin_alconna/matcher.py

@@ -33,10 +33,10 @@
 from nonebot.matcher import Matcher, matchers, current_bot, current_event, current_matcher
 
 from .i18n import Lang
-from .rule import alconna
 from .config import Config
 from .util import annotation
 from .model import CompConfig
+from .rule import AlconnaRule
 from .uniseg import Text, Segment, UniMessage
 from .uniseg.fallback import FallbackStrategy
 from .uniseg.template import UniMessageTemplate
@@ -113,11 +113,11 @@ class AlconnaMatcher(Matcher):
     executor: ClassVar[ExtensionExecutor]
     _command_path: ClassVar[str]
     _tests: ClassVar[list[tuple[UniMessage, dict[str, Any] | None, bool]]]
-    _rule: ClassVar[Rule]
+    _rule: ClassVar[AlconnaRule]
 
     @classmethod
     def command(cls) -> Alconna:
-        return list(cls._rule.checkers)[0].call.command()  # noqa: RUF015
+        return cls._rule.command()  # type: ignore
 
     @classmethod
     @overload
@@ -972,7 +972,7 @@ def on_alconna(
                 command.formatter.add(command)
     except ValueError:
         pass
-    _rule = alconna(
+    _rule = AlconnaRule(
         command,
         skip_for_unmatch,
         auto_send_output,
@@ -985,7 +985,7 @@ def on_alconna(
         response_self,
         aliases,
     )
-    executor = cast(ExtensionExecutor, next(iter(_rule.checkers)).call.executor)  # type: ignore
+    executor = _rule.executor
     params = (
         (ExtensionParam.new(executor),)
         + Matcher.HANDLER_PARAM_TYPES[:-1]
@@ -1001,7 +1001,7 @@ def on_alconna(
         {
             "_source": source,
             "type": "",
-            "rule": _rule & rule,
+            "rule": rule & _rule.rule,
             "permission": Permission() | permission,
             "handlers": (
                 [

src/nonebot_plugin_alconna/rule.py

@@ -3,8 +3,8 @@
 from typing import Any, Union, Literal, Optional
 
 import nonebot
+from tarina import lang
 from nonebot.typing import T_State
-from tarina import lang, init_spec
 from nonebot.matcher import Matcher
 from nonebot.utils import escape_tag
 from pydantic import ValidationError
@@ -198,6 +198,10 @@ async def _waiter_handle(_event: Event, _matcher: Matcher, content: UniMsg):
 
             self._waiter = _waiter_handle
 
+    @property
+    def rule(self) -> Rule:
+        return Rule(self)
+
     def __repr__(self) -> str:
         return f"Alconna(command={self.command()!r})"
 
@@ -348,8 +352,3 @@ async def send(self, text: str, bot: Bot, event: Event, arp: Arparma) -> Any:
             return await bot.send(event, await msg.export(bot, fallback=True))  # type: ignore
         except NotImplementedError:
             return await bot.send(event, event.get_message().__class__(text))
-
-
-@init_spec(AlconnaRule)
-def alconna(rule: AlconnaRule) -> Rule:
-    return Rule(rule)

src/nonebot_plugin_alconna/uniseg/params.py

@@ -2,28 +2,40 @@
 
 from nonebot.typing import T_State
 from nonebot.internal.params import Depends
+from nonebot.exception import SkippedException
 from nonebot.internal.adapter import Bot, Event
 
-from .exporter import Target
 from .message import TS, UniMessage
+from .exporter import Target, SerializeFailed
 from .constraint import UNISEG_TARGET, UNISEG_MESSAGE, UNISEG_MESSAGE_ID
 
 
 async def _uni_msg(bot: Bot, event: Event, state: T_State) -> UniMessage:
     if UNISEG_MESSAGE in state:
         return state[UNISEG_MESSAGE]
+    try:
+        event.get_message()
+    except ValueError:
+        raise SkippedException from None
     return await UniMessage.generate(event=event, bot=bot)
 
 
 def _target(bot: Bot, event: Event, state: T_State) -> Target:
     if UNISEG_TARGET in state:
         return state[UNISEG_TARGET]
-    return UniMessage.get_target(event=event, bot=bot)
+    try:
+        return UniMessage.get_target(event=event, bot=bot)
+    except (SerializeFailed, NotImplementedError, ValueError):
+        raise SkippedException from None
 
 
 def _msg_id(bot: Bot, event: Event, state: T_State) -> str:
     if UNISEG_MESSAGE_ID in state:
         return state[UNISEG_MESSAGE_ID]
+    try:
+        event.get_message()
+    except ValueError:
+        raise SkippedException from None
     return UniMessage.get_message_id(event=event, bot=bot)