✨ 移除saa依赖

zhenxun/plugins/gold_redbag/__init__.py

@@ -10,7 +10,6 @@ from nonebot.plugin import PluginMetadata
 from nonebot.rule import to_me
 from nonebot_plugin_alconna import Alconna, Args, Arparma, At, Match, Option, on_alconna
 from nonebot_plugin_apscheduler import scheduler
-from nonebot_plugin_saa import Image, MessageFactory, Text
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import NICKNAME
@@ -219,7 +218,7 @@ async def _(
             if send_msg
             else MessageUtils.build_message("没有红包给你开！")
         )
-        await send_msg.send(reply=True)
+        await send_msg.send(reply_to=True)
         if settlement_list:
             for red_bag in settlement_list:
                 result_image = await red_bag.build_amount_rank(
@@ -263,7 +262,7 @@ async def _(
                         f"已成功退还了 " f"{data[0]} 金币\n",
                         image_result,
                     ]
-                ).finish(reply=True)
+                ).finish(reply_to=True)
     await MessageUtils.build_message("目前没有红包可以退回...").finish(reply_to=True)
 
 
@@ -297,16 +296,14 @@ async def _(
                     FestiveRedBagManage.remove(festive_red_bag.uuid)
                 rank_image = await festive_red_bag.build_amount_rank(10, platform)
                 try:
-                    await MessageFactory(
+                    await MessageUtils.build_message(
                         [
-                            Text(
-                                f"{NICKNAME}的节日红包过时了，一共开启了 "
-                                f"{len(festive_red_bag.open_user)}"
-                                f" 个红包，共 {sum(festive_red_bag.open_user.values())} 金币\n"
-                            ),
-                            Image(rank_image.pic2bytes()),
+                            f"{NICKNAME}的节日红包过时了，一共开启了 "
+                            f"{len(festive_red_bag.open_user)}"
+                            f" 个红包，共 {sum(festive_red_bag.open_user.values())} 金币\n",
+                            rank_image,
                         ]
-                    ).send_to(target=target, bot=bot)
+                    ).send(target=target, bot=bot)
                 except ActionFailed:
                     pass
             try:
@@ -336,14 +333,12 @@ async def _(
                 image_result = await RedBagManager.random_red_bag_background(
                     bot.self_id, greetings, session.platform
                 )
-                await MessageFactory(
+                await MessageUtils.build_message(
                     [
-                        Text(
-                            f"{NICKNAME}发起了节日金币红包\n金额: {amount}\n数量: {num}\n"
-                        ),
-                        Image(image_result.pic2bytes()),
+                        f"{NICKNAME}发起了节日金币红包\n金额: {amount}\n数量: {num}\n",
+                        image_result,
                     ]
-                ).send_to(target=target, bot=bot)
+                ).send(target=target, bot=bot)
                 _suc_cnt += 1
                 logger.debug("节日红包图片信息发送成功...", "节日红包", group_id=g)
             except ActionFailed:

zhenxun/plugins/gold_redbag/data_source.py

@@ -6,16 +6,16 @@ from typing import Dict
 
 from nonebot.adapters import Bot
 from nonebot.exception import ActionFailed
-from nonebot_plugin_saa import Image, MessageFactory, Text
+from nonebot_plugin_alconna import UniMessage
 
 from zhenxun.configs.config import NICKNAME, Config
 from zhenxun.configs.path_config import IMAGE_PATH
 from zhenxun.models.user_console import UserConsole
 from zhenxun.utils.image_utils import BuildImage
+from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.platform import PlatformUtils
-from zhenxun.utils.utils import get_user_avatar
 
-from .config import FESTIVE_KEY, FestiveRedBagManage, GroupRedBag, RedBag
+from .config import FestiveRedBagManage, GroupRedBag, RedBag
 
 
 class RedBagManager:
@@ -56,16 +56,14 @@ class RedBagManager:
                 FestiveRedBagManage.remove(red_bag.uuid)
             await asyncio.sleep(random.randint(1, 5))
             try:
-                await MessageFactory(
+                await MessageUtils.build_message(
                     [
-                        Text(
-                            f"{NICKNAME}的节日红包过时了，一共开启了 "
-                            f"{len(red_bag.open_user)}"
-                            f" 个红包，共 {sum(red_bag.open_user.values())} 金币\n"
-                        ),
-                        Image(rank_image.pic2bytes()),
+                        f"{NICKNAME}的节日红包过时了，一共开启了 "
+                        f"{len(red_bag.open_user)}"
+                        f" 个红包，共 {sum(red_bag.open_user.values())} 金币\n",
+                        rank_image,
                     ]
-                ).send_to(target=target, bot=bot)
+                ).send(target=target, bot=bot)
             except ActionFailed:
                 pass
 
@@ -76,7 +74,7 @@ class RedBagManager:
         user_id: str | None = None,
         is_festive: bool = False,
         platform: str = "",
-    ) -> MessageFactory | None:
+    ) -> UniMessage | None:
         """结算红包
 
         参数:
@@ -92,14 +90,12 @@ class RedBagManager:
         if is_festive:
             if festive_red_bag := group_red_bag.festive_red_bag_expire():
                 rank_image = await festive_red_bag.build_amount_rank(rank_num, platform)
-                return MessageFactory(
+                return MessageUtils.build_message(
                     [
-                        Text(
-                            f"{NICKNAME}的节日红包过时了，一共开启了 "
-                            f"{len(festive_red_bag.open_user)}"
-                            f" 个红包，共 {sum(festive_red_bag.open_user.values())} 金币\n"
-                        ),
-                        Image(rank_image.pic2bytes()),
+                        f"{NICKNAME}的节日红包过时了，一共开启了 "
+                        f"{len(festive_red_bag.open_user)}"
+                        f" 个红包，共 {sum(festive_red_bag.open_user.values())} 金币\n",
+                        rank_image,
                     ]
                 )
         else:
@@ -108,10 +104,10 @@ class RedBagManager:
             return_gold, red_bag = await group_red_bag.settlement(user_id, platform)
             if red_bag:
                 rank_image = await red_bag.build_amount_rank(rank_num, platform)
-                return MessageFactory(
+                return MessageUtils.build_message(
                     [
-                        Text(f"已成功退还了 " f"{return_gold} 金币\n"),
-                        Image(rank_image.pic2bytes()),
+                        f"已成功退还了 " f"{return_gold} 金币\n",
+                        rank_image.pic2bytes(),
                     ]
                 )