✨ 去除MessageFactory和MessageSegmentFactory的泛型，补充成员方法

nonebot_plugin_saa/adapters/dodo.py

@@ -12,7 +12,6 @@
 from ..utils import SupportedAdapters, SupportedPlatform
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -91,8 +90,8 @@ async def _image(image: Image, bot: BaseBot) -> MessageSegment:
 
     @register_dodo(Reply)
     def _reply(reply: Reply) -> MessageSegment:
-        assert isinstance(reply.data, DodoMessageId)
-        return MessageSegment.reference(reply.data.message_id)
+        assert isinstance(mid := reply.data["message_id"], DodoMessageId)
+        return MessageSegment.reference(mid.message_id)
 
     @register_dodo(Mention)
     def _mention(mention: Mention) -> MessageSegment:
@@ -181,10 +180,13 @@ async def pin(self, is_cancel: bool = False):
         def raw(self) -> str:
             return self.message_id
 
+        def extract_message_id(self) -> DodoMessageId:
+            return DodoMessageId(message_id=self.message_id)
+
     @register_sender(adapter)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/feishu.py

@@ -10,7 +10,6 @@
 from ..types import Text, Image, Reply, Mention
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -78,8 +77,8 @@ def _mention(m: Mention) -> MessageSegment:
 
     @register_feishu(Reply)
     def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, FeishuMessageId)
-        return MessageSegment("reply", {"message_id": r.data.message_id})
+        assert isinstance(mid := r.data["message_id"], FeishuMessageId)
+        return MessageSegment("reply", {"message_id": mid.message_id})
 
     @register_target_extractor(PrivateMessageEvent)
     def _extract_private_msg_event(event: Event) -> TargetFeishuPrivate:
@@ -105,6 +104,9 @@ async def revoke(self):
         def raw(self) -> Any:
             return self.data
 
+        def extract_message_id(self) -> FeishuMessageId:
+            return FeishuMessageId(message_id=self.message_id)
+
     @register_message_id_getter(MessageEvent)
     def _(event: Event) -> FeishuMessageId:
         assert isinstance(event, MessageEvent)
@@ -113,7 +115,7 @@ def _(event: Event) -> FeishuMessageId:
     @register_sender(adapter)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,
@@ -142,8 +144,10 @@ async def send(
         message_to_send = Message()
         for message_segment_factory in full_msg:
             if isinstance(message_segment_factory, Reply):
-                assert isinstance(message_segment_factory.data, FeishuMessageId)
-                reply_to_message_id = message_segment_factory.data.message_id
+                assert isinstance(
+                    mid := message_segment_factory.data["message_id"], FeishuMessageId
+                )
+                reply_to_message_id = mid.message_id
                 continue
 
             message_segment = await message_segment_factory.build(bot)

nonebot_plugin_saa/adapters/kaiheila.py

@@ -9,7 +9,6 @@
 from ..utils import SupportedAdapters, SupportedPlatform
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -84,8 +83,8 @@ def _mention(m: Mention) -> MessageSegment:
 
     @register_kaiheila(Reply)
     def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, KaiheilaMessageId)
-        return MessageSegment.quote(r.data.message_id)
+        assert isinstance(mid := r.data["message_id"], KaiheilaMessageId)
+        return MessageSegment.quote(mid.message_id)
 
     @register_target_extractor(PrivateMessageEvent)
     def _extract_private_msg_event(event: Event) -> TargetKaiheilaPrivate:
@@ -125,6 +124,10 @@ async def revoke(self):
         def raw(self) -> MessageCreateReturn:
             return self.data
 
+        def extract_message_id(self) -> MessageId:
+            assert self.data.msg_id
+            return KaiheilaMessageId(message_id=self.data.msg_id)
+
     @register_message_id_getter(MessageEvent)
     def _(event: Event) -> KaiheilaMessageId:
         assert isinstance(event, MessageEvent)
@@ -133,7 +136,7 @@ def _(event: Event) -> KaiheilaMessageId:
     @register_sender(SupportedAdapters.kaiheila)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/onebot_v11.py

@@ -8,7 +8,6 @@
 from ..utils import SupportedAdapters, SupportedPlatform
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     AggregatedMessageFactory,
     register_ms_adapter,
     assamble_message_factory,
@@ -71,8 +70,8 @@ async def _mention(m: Mention) -> MessageSegment:
 
     @register_onebot_v11(Reply)
     async def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, OB11MessageId)
-        return MessageSegment.reply(r.data.message_id)
+        assert isinstance(mid := r.data["message_id"], OB11MessageId)
+        return MessageSegment.reply(mid.message_id)
 
     @register_target_extractor(PrivateMessageEvent)
     def _extract_private_msg_event(event: Event) -> TargetQQPrivate:
@@ -170,10 +169,13 @@ async def revoke(self):
         def raw(self) -> Any:
             return self.message_id
 
+        def extract_message_id(self) -> OB11MessageId:
+            return OB11MessageId(message_id=self.message_id)
+
     @register_sender(SupportedAdapters.onebot_v11)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/onebot_v12.py

@@ -11,7 +11,6 @@
 from ..utils import SupportedAdapters, SupportedPlatform
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -97,8 +96,8 @@ async def _mention(m: Mention) -> MessageSegment:
 
     @register_onebot_v12(Reply)
     async def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, OB12MessageId)
-        return MessageSegment.reply(r.data.message_id)
+        assert isinstance(mid := r.data["message_id"], OB12MessageId)
+        return MessageSegment.reply(mid.message_id)
 
     @register_target_extractor(PrivateMessageEvent)
     def _extract_private_msg_event(event: Event) -> PlatformTarget:
@@ -254,10 +253,13 @@ async def revoke(self):
         def raw(self):
             return self.message_id
 
+        def extract_message_id(self) -> OB12MessageId:
+            return OB12MessageId(message_id=self.message_id)
+
     @register_sender(SupportedAdapters.onebot_v12)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/qq.py

@@ -9,7 +9,6 @@
 from ..auto_select_bot import register_list_targets
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -73,8 +72,8 @@ def _mention(m: Mention) -> MessageSegment:
 
     @register_qq(Reply)
     def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, QQMessageId)
-        return MessageSegment.reference(r.data.message_id)
+        assert isinstance(mid := r.data["message_id"], QQMessageId)
+        return MessageSegment.reference(mid.message_id)
 
     @register_target_extractor(GuildMessageEvent)
     def extract_message_event(event: Event) -> PlatformTarget:
@@ -138,10 +137,16 @@ async def revoke(self, hidetip=False):
         def raw(self):
             return self.msg_return
 
+        def extract_message_id(self) -> QQMessageId:
+            assert hasattr(self.msg_return, "id")
+            id = getattr(self.msg_return, "id")
+            assert isinstance(id, str)
+            return QQMessageId(message_id=id)
+
     @register_sender(SupportedAdapters.qq)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target: PlatformTarget,
         event: Optional[Event],
         at_sender: bool,

nonebot_plugin_saa/adapters/qqguild.py

@@ -9,7 +9,6 @@
 from ..auto_select_bot import register_list_targets
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -63,8 +62,8 @@ def _mention(m: Mention) -> MessageSegment:
 
     @register_qqguild(Reply)
     def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, QQGuildMessageId)
-        return MessageSegment.reference(r.data.message_id)
+        assert isinstance(mid := r.data["message_id"], QQGuildMessageId)
+        return MessageSegment.reference(mid.message_id)
 
     @register_target_extractor(MessageEvent)
     def extract_message_event(event: Event) -> PlatformTarget:
@@ -108,10 +107,14 @@ async def revoke(self, hidetip=False):
         def raw(self):
             return self.sent_msg
 
+        def extract_message_id(self) -> QQGuildMessageId:
+            assert self.sent_msg.id
+            return QQGuildMessageId(message_id=self.sent_msg.id)
+
     @register_sender(SupportedAdapters.qqguild)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/red.py

@@ -11,7 +11,6 @@
 from ..utils import SupportedAdapters, SupportedPlatform
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     AggregatedMessageFactory,
     register_ms_adapter,
     assamble_message_factory,
@@ -72,11 +71,11 @@ async def _mention(m: Mention) -> MessageSegment:
 
     @register_red(Reply)
     async def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, RedMessageId)
+        assert isinstance(mid := r.data["message_id"], RedMessageId)
         return MessageSegment.reply(
-            message_seq=r.data.message_seq,
-            message_id=r.data.message_id,
-            sender_uin=r.data.sender_uin,
+            message_seq=mid.message_seq,
+            message_id=mid.message_id,
+            sender_uin=mid.sender_uin,
         )
 
     @register_target_extractor(PrivateMessageEvent)
@@ -123,10 +122,17 @@ async def revoke(self):
         def raw(self) -> MessageModel:
             return self.message
 
+        def extract_message_id(self) -> RedMessageId:
+            return RedMessageId(
+                message_seq=self.message.msgSeq,
+                message_id=self.message.msgId,
+                sender_uin=self.message.senderUin,
+            )
+
     @register_sender(SupportedAdapters.red)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,

nonebot_plugin_saa/adapters/telegram.py

@@ -11,7 +11,6 @@
 from ..types import Text, Image, Reply, Mention
 from ..abstract_factories import (
     MessageFactory,
-    MessageSegmentFactory,
     register_ms_adapter,
     assamble_message_factory,
 )
@@ -71,8 +70,8 @@ async def _mention(m: Mention) -> MessageSegment:
 
     @register_telegram(Reply)
     async def _reply(r: Reply) -> MessageSegment:
-        assert isinstance(r.data, TelegramMessageId)
-        return MessageSegment("reply", {"message_id": str(r.data.message_id)})
+        assert isinstance(mid := r.data["message_id"], TelegramMessageId)
+        return MessageSegment("reply", {"message_id": str(mid.message_id)})
 
     @register_target_extractor(PrivateMessageEvent)
     @register_target_extractor(GroupMessageEvent)
@@ -129,6 +128,9 @@ async def revoke(self):
         def raw(self):
             return self.messages
 
+        def extract_message_id(self) -> List[TelegramMessageId]:
+            return [TelegramMessageId(message_id=x.message_id) for x in self.messages]
+
     @register_message_id_getter(MessageEvent)
     def _(event: Event):
         assert isinstance(event, MessageEvent)
@@ -137,7 +139,7 @@ def _(event: Event):
     @register_sender(SupportedAdapters.telegram)
     async def send(
         bot,
-        msg: MessageFactory[MessageSegmentFactory],
+        msg: MessageFactory,
         target,
         event,
         at_sender: bool,
@@ -166,8 +168,10 @@ async def send(
         message_to_send = Message()
         for message_segment_factory in full_msg:
             if isinstance(message_segment_factory, Reply):
-                assert isinstance(message_segment_factory.data, TelegramMessageId)
-                reply_to_message_id = message_segment_factory.data.message_id
+                assert isinstance(
+                    mid := message_segment_factory.data["message_id"], TelegramMessageId
+                )
+                reply_to_message_id = mid.message_id
                 continue
 
             if (

nonebot_plugin_saa/registries/message_id.py

@@ -1,3 +1,4 @@
+from abc import ABC
 from typing_extensions import Annotated
 from typing import Dict, Type, Callable, Optional
 
@@ -8,7 +9,7 @@
 from ..utils import SupportedAdapters
 
 
-class MessageId(SerializationMeta):
+class MessageId(SerializationMeta, ABC):
     _index_key = "adapter_name"
 
     adapter_name: SupportedAdapters

nonebot_plugin_saa/registries/receipt.py

@@ -1,8 +1,10 @@
 from typing import Any
+from abc import abstractmethod
 
 from nonebot import get_bot
 from nonebot.adapters import Bot
 
+from .message_id import MessageId
 from .meta import SerializationMeta
 from ..utils import SupportedAdapters
 
@@ -22,3 +24,8 @@ async def revoke(self):
     @property
     def raw(self) -> Any:
         ...
+
+    @abstractmethod
+    def extract_message_id(self) -> MessageId:
+        """从 Receipt 中提取 MessageId"""
+        ...