⬆️ version 0.58.4

upgrade `Milky`

Author: RF-Tar-Railt

pdm.lock

@@ -72,7 +72,7 @@ dev = [
     "pyyaml>=6.0.1",
     "fix-future-annotations>=0.5.0",
     # "nonebot-adapter-heybox>=0.1.1; python_version >= \"3.11\"",
-    "nonebot-adapter-milky>=0.1.3",
+    "nonebot-adapter-milky>=0.4.0",
 ]
 test = [
     "nonebug>=0.4.3",

pyproject.toml

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

src/nonebot_plugin_alconna/__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.58.3"
+__version__ = "0.58.4"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -93,11 +93,7 @@ def record(self, seg: RecordSegment):
 
     @build("reply")
     def reply(self, seg: ReplySegment):
-        if "client_seq" in seg.data:
-            msg_id = f"{seg.data['message_seq']}#{seg.data['client_seq']}"
-        else:
-            msg_id = str(seg.data["message_seq"])
-        return Reply(msg_id, origin=seg)
+        return Reply(str(seg.data["message_seq"]), origin=seg)
 
     @build("forward")
     def forward(self, seg: ForwardSegment):
@@ -122,9 +118,6 @@ async def extract_reply(self, event: Event, bot: Bot):
         if TYPE_CHECKING:
             assert isinstance(event, MessageEvent)
         if _reply := event.reply:
-            if _reply.client_seq:
-                msg_id = f"{_reply.message_seq}#{_reply.client_seq}"
-            else:
-                msg_id = str(_reply.message_seq)
+            msg_id = f"{_reply.message_seq}@{event.data.message_scene}:{event.data.peer_id}"
             return Reply(msg_id, _reply.message, _reply)
         return None

src/nonebot_plugin_alconna/uniseg/adapters/milky/builder.py

@@ -6,9 +6,9 @@
 from nonebot.adapters.milky.utils import to_uri
 from nonebot.adapters.milky.bot import Bot as MilkyBot
 from nonebot.adapters.milky.event import Event as MilkyEvent
+from nonebot.adapters.milky.model.api import MessageResponse
 from nonebot.adapters.milky.message import Message, MessageSegment
 from nonebot.adapters.milky.event import MessageEvent, MessageRecallEvent
-from nonebot.adapters.milky.model.api import MessageGroupResponse, MessagePrivateResponse
 
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope
 from nonebot_plugin_alconna.uniseg.exporter import Target, SupportAdapter, MessageExporter, SerializeFailed, export
@@ -64,12 +64,10 @@ 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)) is not None:
-            return str(message_id)
         assert isinstance(event, MilkyEvent)
         if (message_seq := getattr(event.data, "message_seq", None)) is not None:
-            if (client_seq := getattr(event.data, "client_seq", None)) is not None:
-                return f"{message_seq}#{client_seq}"
+            if isinstance(event, MessageEvent):
+                return f"{message_seq}@{event.data.message_scene}:{event.data.peer_id}"
             return str(message_seq)
         raise NotImplementedError
 
@@ -164,8 +162,8 @@ async def file(self, seg: File, bot: Union[Bot, None]) -> "MessageSegment":
 
     @export
     async def reply(self, seg: Reply, bot: Union[Bot, None]) -> "MessageSegment":
-        message_seq, _, client_seq = seg.id.partition("#")
-        return MessageSegment.reply(int(message_seq), int(client_seq) if client_seq else None)
+        message_seq, *_ = seg.id.split("@")
+        return MessageSegment.reply(int(message_seq))
 
     @export
     async def reference(self, seg: Reference, bot: Union[Bot, None]) -> "MessageSegment":
@@ -229,74 +227,83 @@ async def send_to(self, target: Union[Target, Event], bot: Bot, message: Message
 
     async def recall(self, mid: Any, bot: Bot, context: Union[Target, Event]):
         assert isinstance(bot, MilkyBot)
-        if isinstance(mid, MessagePrivateResponse):
-            user_id = int(context.id if isinstance(context, Target) else context.get_user_id())
-            await bot.recall_private_message(user_id=user_id, message_seq=mid.message_seq, client_seq=mid.client_seq)
-        elif isinstance(mid, MessageGroupResponse):
-            group_id = int(context.id if isinstance(context, Target) else getattr(context.data, "group_id", -1))  # type: ignore
-            await bot.recall_group_message(group_id=group_id, message_seq=mid.message_seq)
-        elif isinstance(mid, int):
-            if isinstance(context, Target):
-                assert not context.private
-                group_id = int(context.id)
-            else:
-                group_id = int(getattr(context.data, "group_id", -1))  # type: ignore
-            await bot.recall_group_message(group_id=group_id, message_seq=mid)
-        elif isinstance(mid, str):
-            message_seq, _, client_seq = mid.partition("#")
-            if not client_seq:
-                if isinstance(context, Target):
-                    assert not context.private
-                    group_id = int(context.id)
-                else:
-                    assert not context.is_private  # type: ignore
-                    group_id = int(getattr(context.data, "group_id", -1))  # type: ignore
-                await bot.recall_group_message(group_id=group_id, message_seq=int(message_seq))
-            else:
-                user_id = int(context.id if isinstance(context, Target) else context.get_user_id())
-                await bot.recall_private_message(
-                    user_id=user_id, message_seq=int(message_seq), client_seq=int(client_seq)
-                )
-        elif isinstance(mid, File) and mid.id:
+        if isinstance(mid, File) and mid.id:
             if isinstance(context, Target):
                 if not context.private:
                     group_id = int(context.id)
                     await bot.delete_group_file(group_id=group_id, file_id=mid.id)
             elif not context.is_private:  # type: ignore
                 group_id = int(getattr(context.data, "group_id", -1))  # type: ignore
                 await bot.delete_group_file(group_id=group_id, file_id=mid.id)
+            return
+        if isinstance(mid, MessageResponse):
+            message_seq = mid.message_seq
+        elif isinstance(mid, int):
+            message_seq = mid
+        elif isinstance(mid, str):
+            message_seq, _, target = mid.partition("@")
+            message_seq = int(message_seq)
+            if target:
+                scene, _, peer_id = target.partition(":")
+                if scene == "group":
+                    await bot.recall_group_message(group_id=int(peer_id), message_seq=message_seq)
+                else:
+                    await bot.recall_private_message(user_id=int(peer_id), message_seq=message_seq)
+                return
+        else:
+            return
+        if isinstance(context, Target):
+            if context.private:
+                user_id = int(context.id)
+                await bot.recall_private_message(user_id=user_id, message_seq=message_seq)
+            else:
+                group_id = int(context.id)
+                await bot.recall_group_message(group_id=group_id, message_seq=message_seq)
+        elif isinstance(context, MilkyEvent):
+            if context.is_private:
+                user_id = int(context.get_user_id())
+                await bot.recall_private_message(user_id=user_id, message_seq=message_seq)
+            else:
+                group_id = int(getattr(context.data, "group_id", -1))
+                await bot.recall_group_message(group_id=group_id, message_seq=message_seq)
 
     async def reaction(self, emoji: Emoji, mid: Any, bot: Bot, context: Union[Target, Event], delete: bool = False):
         assert isinstance(bot, MilkyBot)
 
-        if isinstance(mid, MessagePrivateResponse):
+        if isinstance(context, Target):
+            if context.private:
+                return
+            group_id = int(context.id)
+        elif isinstance(context, MilkyEvent):
+            if context.is_private:
+                return
+            group_id = int(getattr(context.data, "group_id", -1))  # type: ignore
+        else:
             return
-        group_id = int(context.id if isinstance(context, Target) else getattr(context.data, "group_id", -1))  # type: ignore
-        if isinstance(mid, MessageGroupResponse):
+        if isinstance(mid, MessageResponse):
             message_seq = mid.message_seq
         elif isinstance(mid, int):
             message_seq = mid
         elif isinstance(mid, str):
-            message_seq, _, client_seq = mid.partition("#")
-            if client_seq:
-                return
+            message_seq, _, target = mid.partition("@")
             message_seq = int(message_seq)
+            if target:
+                scene, _, peer_id = target.partition(":")
+                if scene == "group":
+                    group_id = int(peer_id)
+                else:
+                    return
         else:
             return
         await bot.send_group_message_reaction(
             group_id=group_id, message_seq=message_seq, reaction=emoji.id, is_add=not delete
         )
 
     def get_reply(self, mid: Any):
-        if isinstance(mid, MessagePrivateResponse):
-            return Reply(f"{mid.message_seq}#{mid.client_seq}", origin=mid)
-        if isinstance(mid, MessageGroupResponse):
+        if isinstance(mid, MessageResponse):
             return Reply(str(mid.message_seq), origin=mid)
         if isinstance(mid, int):
             return Reply(str(mid))
         if isinstance(mid, str):
-            message_seq, _, client_seq = mid.partition("#")
-            if client_seq:
-                return Reply(f"{message_seq}#{client_seq}")
-            return Reply(str(message_seq))
+            return Reply(mid)
         raise ValueError(f"Invalid message id: {mid}")