✨ 移除saa依赖

zhenxun/builtin_plugins/superuser/group_manage.py

@@ -14,7 +14,6 @@ from nonebot_plugin_alconna import (
     on_alconna,
     store_true,
 )
-from nonebot_plugin_saa import Text
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import NICKNAME
@@ -22,6 +21,7 @@ from zhenxun.configs.utils import PluginExtraData
 from zhenxun.models.group_console import GroupConsole
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.message import MessageUtils
 
 __plugin_meta__ = PluginMetadata(
     name="管理群操作",
@@ -139,7 +139,7 @@ def CheckGroupId():
         if group_id.available:
             gid = group_id.result
         if not gid:
-            await Text("群组id不能为空...").finish()
+            await MessageUtils.build_message("群组id不能为空...").finish()
         state["group_id"] = gid
 
     return Depends(dependency)
@@ -152,7 +152,7 @@ async def _(session: EventSession, arparma: Arparma, state: T_State, level: int)
     old_level = group.level
     group.level = level
     await group.save(update_fields=["level"])
-    await Text("群权限修改成功!").send(reply=True)
+    await MessageUtils.build_message("群权限修改成功!").send(reply_to=True)
     logger.info(
         f"修改群权限: {old_level} -> {level}",
         arparma.header_result,
@@ -166,11 +166,11 @@ async def _(session: EventSession, arparma: Arparma, state: T_State):
     gid = state["group_id"]
     group = await GroupConsole.get_or_none(group_id=gid)
     if not group:
-        await Text("群组信息不存在, 请更新群组信息...").finish()
+        await MessageUtils.build_message("群组信息不存在, 请更新群组信息...").finish()
     s = "删除" if arparma.find("del") else "添加"
     group.is_super = not arparma.find("del")
     await group.save(update_fields=["is_super"])
-    await Text(f"{s}群白名单成功!").send(reply=True)
+    await MessageUtils.build_message(f"{s}群白名单成功!").send(reply_to=True)
     logger.info(f"{s}群白名单", arparma.header_result, session=session, target=gid)
 
 
@@ -181,7 +181,7 @@ async def _(session: EventSession, arparma: Arparma, state: T_State):
         group_id=gid, defaults={"group_flag": 0 if arparma.find("del") else 1}
     )
     s = "删除" if arparma.find("del") else "添加"
-    await Text(f"{s}群认证成功!").send(reply=True)
+    await MessageUtils.build_message(f"{s}群认证成功!").send(reply_to=True)
     logger.info(f"{s}群白名单", arparma.header_result, session=session, target=gid)
 
 
@@ -191,17 +191,17 @@ async def _(bot: Bot, session: EventSession, arparma: Arparma, group_id: int):
         group_list = [g["group_id"] for g in await bot.get_group_list()]
         if group_id not in group_list:
             logger.debug("群组不存在", "退群", session=session, target=group_id)
-            await Text(f"{NICKNAME}未在该群组中...").finish()
+            await MessageUtils.build_message(f"{NICKNAME}未在该群组中...").finish()
         try:
             await bot.set_group_leave(group_id=group_id)
             logger.info(
                 f"{NICKNAME}退出群组成功", "退群", session=session, target=group_id
             )
-            await Text(f"退出群组 {group_id} 成功!").send()
+            await MessageUtils.build_message(f"退出群组 {group_id} 成功!").send()
             await GroupConsole.filter(group_id=group_id).delete()
         except Exception as e:
             logger.error(f"退出群组失败", "退群", session=session, target=group_id, e=e)
-            await Text(f"退出群组 {group_id} 失败...").send()
+            await MessageUtils.build_message(f"退出群组 {group_id} 失败...").send()
     else:
         # TODO: 其他平台的退群操作
-        await Text(f"暂未支持退群操作...").send()
+        await MessageUtils.build_message(f"暂未支持退群操作...").send()