✨ 移除saa依赖

zhenxun/builtin_plugins/superuser/broadcast/__init__.py

@@ -7,13 +7,12 @@ from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Text as alcText
 from nonebot_plugin_alconna import UniMsg
-from nonebot_plugin_saa import Text
 from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.config import Config
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.message import MessageUtils
 
 from ._data_source import BroadcastManage
 
@@ -56,10 +55,10 @@ async def _(
         if isinstance(msg, alcText) and msg.text.strip().startswith(command[0]):
             msg.text = msg.text.replace(command[0], "", 1).strip()
             break
-    await Text("正在发送..请等一下哦!").send()
+    await MessageUtils.build_message("正在发送..请等一下哦!").send()
     count, error_count = await BroadcastManage.send(bot, message, session)
     result = f"成功广播 {count} 个群组"
     if error_count:
         result += f"\n广播失败 {error_count} 个群组"
-    await Text(f"发送广播完成!\n{result}").send(reply=True)
+    await MessageUtils.build_message(f"发送广播完成!\n{result}").send(reply_to=True)
     logger.info(f"发送广播信息: {message}", "广播", session=session)

zhenxun/builtin_plugins/superuser/broadcast/_data_source.py

@@ -1,17 +1,17 @@
 import nonebot_plugin_alconna as alc
 from nonebot.adapters import Bot
-from nonebot.adapters.discord import Bot as DiscordBot
-from nonebot.adapters.dodo import Bot as DodoBot
-from nonebot.adapters.kaiheila import Bot as KaiheilaBot
-from nonebot.adapters.onebot.v11 import Bot as v11Bot
-from nonebot.adapters.onebot.v12 import Bot as v12Bot
-from nonebot_plugin_alconna import UniMsg
-from nonebot_plugin_saa import Image, MessageFactory, Text
+
+# from nonebot.adapters.discord import Bot as DiscordBot
+# from nonebot.adapters.dodo import Bot as DodoBot
+# from nonebot.adapters.kaiheila import Bot as KaiheilaBot
+# from nonebot.adapters.onebot.v11 import Bot as v11Bot
+# from nonebot.adapters.onebot.v12 import Bot as v12Bot
+from nonebot_plugin_alconna import Image, UniMsg
 from nonebot_plugin_session import EventSession
 
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.models.task_info import TaskInfo
 from zhenxun.services.log import logger
+from zhenxun.utils.message import MessageUtils
 from zhenxun.utils.platform import PlatformUtils
 
 
@@ -34,9 +34,9 @@ class BroadcastManage:
         message_list = []
         for msg in message:
             if isinstance(msg, alc.Image) and msg.url:
-                message_list.append(Image(msg.url))
+                message_list.append(Image(url=msg.url))
             elif isinstance(msg, alc.Text):
-                message_list.append(Text(msg.text))
+                message_list.append(msg.text)
         group_list, _ = await PlatformUtils.get_group_list(bot)
         if group_list:
             error_count = 0
@@ -50,7 +50,9 @@ class BroadcastManage:
                             bot, None, group.channel_id or group.group_id
                         )
                         if target:
-                            await MessageFactory(message_list).send_to(target, bot)
+                            await MessageUtils.build_message(message_list).send(
+                                target, bot
+                            )
                             logger.debug(
                                 "发送成功",
                                 "广播",