🔖 version 0.57.5

Author: RF-Tar-Railt

src/nonebot_plugin_alconna/__init__.py

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

src/nonebot_plugin_alconna/uniseg/__init__.py

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

src/nonebot_plugin_alconna/uniseg/adapters/onebot11/exporter.py

@@ -34,14 +34,14 @@ def get_adapter(cls) -> SupportAdapter:
         return SupportAdapter.onebot11
 
     def get_target(self, event: Event, bot: Union[Bot, None] = None) -> Target:
-        if group_id := getattr(event, "group_id", None):
+        if (group_id := getattr(event, "group_id", None)) is not None:
             return Target(
                 str(group_id),
                 adapter=self.get_adapter(),
                 self_id=bot.self_id if bot else None,
                 scope=SupportScope.qq_client,
             )
-        if user_id := getattr(event, "user_id", None):
+        if (user_id := getattr(event, "user_id", None)) is not None:
             return Target(
                 str(user_id),
                 private=True,
@@ -52,7 +52,7 @@ def get_target(self, event: Event, bot: Union[Bot, None] = None) -> Target:
         raise NotImplementedError
 
     def get_message_id(self, event: Event) -> str:
-        if message_id := getattr(event, "message_id", None):
+        if (message_id := getattr(event, "message_id", None)) is not None:
             return str(message_id)
         raise NotImplementedError
 
@@ -217,7 +217,7 @@ async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Union[Target
                     return
                 group_id = int(context.id)
             else:
-                if not (group_id := getattr(context, "group_id", None)):
+                if (group_id := getattr(context, "group_id", None)) is None:
                     return
                 group_id = int(group_id)
             await bot.call_api(

tests/fake.py

@@ -19,6 +19,37 @@ def get_msg_id() -> int:
     return next(_msg_ids)
 
 
+def fake_self_message_event_v11(**field) -> "GroupMessageEventV11":
+    from pydantic import create_model
+    from nonebot.adapters.onebot.v11.event import Sender
+    from nonebot.adapters.onebot.v11 import Message, GroupMessageEvent
+
+    _fake = create_model("_fake", __base__=GroupMessageEvent)
+
+    class FakeEvent(_fake):
+        time: int = 1000000
+        self_id: int = 1
+        post_type: Literal["message_sent"] = "message_sent"
+        sub_type: str = "normal"
+        user_id: int = 1
+        message_type: Literal["group"] = "group"
+        group_id: int = 10000
+        message: Message = Message("test")
+        raw_message: str = "test"
+        font: int = 0
+        sender: Sender = Sender(
+            card="",
+            nickname="test",
+            role="member",
+        )
+        to_me: bool = True
+
+        class Config:
+            extra = "allow"
+
+    return FakeEvent(message_id=get_msg_id(), **field)
+
+
 def fake_group_message_event_v11(**field) -> "GroupMessageEventV11":
     from pydantic import create_model
     from nonebot.adapters.onebot.v11.event import Sender

tests/test_onebot.py

@@ -3,7 +3,7 @@
 from nonebot import get_adapter
 from nonebot.adapters.onebot.v11 import Bot, Adapter, Message, MessageSegment
 
-from tests.fake import fake_group_message_event_v11
+from tests.fake import fake_self_message_event_v11, fake_group_message_event_v11
 
 
 @pytest.mark.asyncio()
@@ -30,3 +30,30 @@ async def _(city: str):
         ev2 = fake_group_message_event_v11(message=Message([MessageSegment.face(i) for i in range(50)]), user_id=123)
         ctx.receive_event(bot, ev2)
         ctx.should_not_pass_rule(matcher)
+
+
+@pytest.mark.asyncio()
+async def test_sent(app: App):
+    from nonebot_plugin_alconna import Alconna, AlconnaMatcher, on_alconna
+
+    mat1 = on_alconna("sent1", response_self=True)
+    mat2 = on_alconna("sent2", response_self=False)
+
+    @mat1.handle()
+    @mat2.handle()
+    async def _(cmd: Alconna, mat: AlconnaMatcher):
+        await mat.send(cmd.name)
+
+    async with app.test_matcher(mat1) as ctx:
+        adapter = get_adapter(Adapter)
+        bot = ctx.create_bot(base=Bot, adapter=adapter, self_id="123")
+        event = fake_self_message_event_v11(message=Message("sent1"), user_id=123, self_id=123)
+        ctx.receive_event(bot, event)
+        ctx.should_call_send(event, "sent1")
+
+    async with app.test_matcher(mat2) as ctx:
+        adapter = get_adapter(Adapter)
+        bot = ctx.create_bot(base=Bot, adapter=adapter, self_id="123")
+        event = fake_self_message_event_v11(message=Message("sent2"), user_id=123, self_id=123)
+        ctx.receive_event(bot, event)
+        ctx.should_not_pass_rule(mat2)