🐛 support satori 0.12

nonebot · Jun 14, 2024 · 500a29c · 500a29c
1 parent ff4816a
commit 500a29c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/nonebot_plugin_alconna/uniseg/adapters/satori/__init__.py b/src/nonebot_plugin_alconna/uniseg/adapters/satori/__init__.py
@@ -13,11 +13,10 @@ def get_satori_version():
 
 
 class Loader(BaseLoader):
-
     def __init__(self):
         if version := get_satori_version():
-            if tuple(map(int, version.split(".")[:2])) < (0, 11):
-                raise ImportError("nonebot-adapter-satori>=0.11 is required.")
+            if tuple(map(int, version.split(".")[:2])) < (0, 12):
+                raise ImportError("nonebot-adapter-satori>=0.12 is required.")
 
     def get_adapter(self) -> SupportAdapter:
         return SupportAdapter.satori

diff --git a/src/nonebot_plugin_alconna/uniseg/adapters/satori/exporter.py b/src/nonebot_plugin_alconna/uniseg/adapters/satori/exporter.py
@@ -7,7 +7,7 @@
 from nonebot.adapters.satori.message import STYLE_TYPE_MAP
 from nonebot.adapters.satori.event import NoticeEvent, MessageEvent
 from nonebot.adapters.satori.message import Message, MessageSegment
-from nonebot.adapters.satori.models import ChannelType, InnerMessage
+from nonebot.adapters.satori.models import ChannelType, MessageObject
 
 from nonebot_plugin_alconna.uniseg.target import Target
 from nonebot_plugin_alconna.uniseg.constraint import SupportScope
@@ -171,7 +171,7 @@ 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, SatoriBot)
-        _mid: InnerMessage = cast(InnerMessage, mid)
+        _mid: MessageObject = cast(MessageObject, mid)
         if isinstance(context, Target):
             if context.private:
                 channel = await bot.user_channel_create(user_id=context.id)
@@ -190,7 +190,7 @@ async def edit(self, new: Message, mid: Any, bot: Bot, context: Union[Target, Ev
         if TYPE_CHECKING:
             assert isinstance(new, self.get_message_type())
 
-        _mid: InnerMessage = cast(InnerMessage, mid)
+        _mid: MessageObject = cast(MessageObject, mid)
         if isinstance(context, Target):
             if context.private:
                 channel = await bot.user_channel_create(user_id=context.id)
@@ -202,5 +202,5 @@ async def edit(self, new: Message, mid: Any, bot: Bot, context: Union[Target, Ev
         return await bot.update_message(channel.id, _mid.id, new)
 
     def get_reply(self, mid: Any):
-        _mid: InnerMessage = cast(InnerMessage, mid)
+        _mid: MessageObject = cast(MessageObject, mid)
         return Reply(_mid.id)
diff --git a/tests/fake.py b/tests/fake.py
@@ -89,7 +89,7 @@ def fake_message_event_satori(**field) -> "SatoriMessageEvent":
     from pydantic import create_model
     from nonebot.adapters.satori import Message
     from nonebot.adapters.satori.event import MessageEvent
-    from nonebot.adapters.satori.models import User, Channel, ChannelType, InnerMessage
+    from nonebot.adapters.satori.models import User, Channel, ChannelType, MessageObject
 
     _Fake = create_model("_Fake", __base__=MessageEvent)
 
@@ -101,7 +101,7 @@ class FakeEvent(_Fake):
         timestamp: datetime = datetime.fromtimestamp(1000000)
         channel: Channel = Channel(id="1", type=ChannelType.TEXT)
         user: User = User(id="1", name="test")
-        message: InnerMessage = InnerMessage(id="1", content="text")
+        message: MessageObject = MessageObject(id="1", content="text")
         to_me: bool = False
 
         class Config: