✨ 移除saa依赖

zhenxun/plugins/draw_card/handles/prts_handle.py

@@ -7,12 +7,13 @@ import dateparser
 import ujson as json
 from lxml import etree
 from lxml.etree import _Element
-from nonebot_plugin_saa import Image, MessageFactory, Text
+from nonebot_plugin_alconna import UniMessage
 from PIL import ImageDraw
 from pydantic import ValidationError
 
 from zhenxun.services.log import logger
 from zhenxun.utils.image_utils import BuildImage
+from zhenxun.utils.message import MessageUtils
 
 from ..config import draw_config
 from ..util import cn2py, load_font, remove_prohibited_str
@@ -102,7 +103,7 @@ class PrtsHandle(BaseHandle[Operator]):
             info = f"当前up池: {self.UP_EVENT.title}\n{info}"
         return info.strip()
 
-    async def draw(self, count: int, **kwargs) -> MessageFactory:
+    async def draw(self, count: int, **kwargs) -> UniMessage:
         index2card = self.get_cards(count)
         """这里cards修复了抽卡图文不符的bug"""
         cards = [card[0] for card in index2card]
@@ -110,7 +111,7 @@ class PrtsHandle(BaseHandle[Operator]):
         result = self.format_result(index2card, up_list=up_list)
         pool_info = self.format_pool_info()
         img = await self.generate_img(cards)
-        return MessageFactory([Text(pool_info), Image(img.pic2bytes()), Text(result)])
+        return MessageUtils.build_message([pool_info, img, result])
 
     async def generate_card_img(self, card: Operator) -> BuildImage:
         sep_w = 5
@@ -331,13 +332,13 @@ class PrtsHandle(BaseHandle[Operator]):
                     )
                 break
 
-    async def _reload_pool(self) -> MessageFactory | None:
+    async def _reload_pool(self) -> UniMessage | None:
         await self.update_up_char()
         self.load_up_char()
         if self.UP_EVENT:
-            return MessageFactory(
+            return MessageUtils.build_message(
                 [
-                    Text(f"重载成功！\n当前UP池子：{self.UP_EVENT.title}"),
-                    Image(self.UP_EVENT.pool_img),
+                    f"重载成功！\n当前UP池子：{self.UP_EVENT.title}",
+                    self.UP_EVENT.pool_img,
                 ]
             )