🐛 version 0.56.1

fix use_origin

Author: RF-Tar-Railt

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "nonebot-plugin-waiter>=0.6.0",
 ]
 dynamic = ["version"]
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 readme = "README.md"
 license = {text = "MIT"}
 keywords = [

src/nonebot_plugin_alconna/__init__.py

@@ -137,7 +137,7 @@
 from .uniseg import SupportAdapterModule as SupportAdapterModule
 from .extension import add_global_extension as add_global_extension
 
-__version__ = "0.56.0"
+__version__ = "0.56.1"
 __supported_adapters__ = set(m.value for m in SupportAdapterModule.__members__.values())  # noqa: C401
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

src/nonebot_plugin_alconna/extension.py

@@ -126,6 +126,7 @@ def id(self) -> str:
 _callbacks = set()
 
 unimsg_cache: LRU[str, UniMessage] = LRU(16)
+unimsg_origin_cache: LRU[str, UniMessage] = LRU(16)
 
 
 class ExtensionExecutor:
@@ -209,16 +210,20 @@ async def message_provider(
         self, event: Event, state: T_State, bot: Bot, use_origin: bool = False
     ) -> UniMessage | None:
         if event.get_type().startswith("message"):
-            msg = event.get_message()
-            if use_origin:
-                msg = getattr(event, "original_message", None) or msg  # type: ignore
             msg_id = UniMessage.get_message_id(event, bot)
+            if use_origin and (uni_msg := unimsg_origin_cache.get(msg_id)) is not None:
+                return uni_msg
             if (uni_msg := unimsg_cache.get(msg_id)) is not None:
-                msg = uni_msg
-            else:
-                msg = UniMessage.generate_without_reply(message=msg, bot=bot)
-                unimsg_cache[msg_id] = msg
-            return msg
+                return uni_msg
+            msg = event.get_message()
+            uni_msg = UniMessage.generate_without_reply(message=msg, bot=bot)
+            unimsg_cache[msg_id] = uni_msg
+            if (ori_msg := getattr(event, "original_message", None)) is not None:
+                ori_uni_msg = UniMessage.generate_without_reply(message=ori_msg, bot=bot)
+                unimsg_origin_cache[msg_id] = ori_uni_msg
+                if use_origin:
+                    return ori_uni_msg
+            return uni_msg
         exc = None
         for ext in self.context:
             if not ext._overrides["message_provider"]:

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -58,7 +58,7 @@
 from .constraint import SupportAdapterModule as SupportAdapterModule
 from .adapters import alter_get_builder, alter_get_fetcher, alter_get_exporter
 
-__version__ = "0.56.0"
+__version__ = "0.56.1"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",

tests/fake.py

@@ -158,9 +158,10 @@ class Config:
             extra = "allow"
 
     _message = field.pop("message", Message("test"))
+    _original_message = field.pop("original_message", _message)
     event = FakeEvent(message={"id": str(get_msg_id()), "content": "text"}, **field)  # type: ignore
     event._message = _message
-    event.original_message = _message
+    event.original_message = _original_message
     return event
 
 

tests/test_use_origin.py

@@ -0,0 +1,31 @@
+import pytest
+from nonebug import App
+from nonebot import get_adapter
+from arclet.alconna import Alconna
+from nonebot.adapters.satori import Bot, Adapter, Message
+
+from tests.fake import fake_satori_bot_params, fake_message_event_satori
+
+
+@pytest.mark.asyncio()
+async def test_use_origin(app: App):
+    from nonebot_plugin_alconna import on_alconna
+
+    test_cmd = on_alconna(Alconna("log"), use_origin=False)
+    test_cmd1 = on_alconna(Alconna("ALClog"), use_origin=True)
+
+    @test_cmd.handle()
+    async def _():
+        await test_cmd.send("ok")
+
+    @test_cmd1.handle()
+    async def _():
+        await test_cmd1.send("ok1")
+
+    async with app.test_matcher([test_cmd, test_cmd1]) as ctx:
+        adapter = get_adapter(Adapter)
+        bot = ctx.create_bot(base=Bot, adapter=adapter, **fake_satori_bot_params())
+        event = fake_message_event_satori(message=Message("log"), original_message=Message("ALClog"), id=123)
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "ok")
+        ctx.should_call_send(event, "ok1")