🎨 统一发送格式

zhenxun/plugins/word_bank/word_handle.py

@@ -9,14 +9,15 @@ from nonebot.params import RegexGroup
 from nonebot.plugin import PluginMetadata
 from nonebot.typing import T_State
 from nonebot_plugin_alconna import AlconnaQuery, Arparma
+from nonebot_plugin_alconna import Image
 from nonebot_plugin_alconna import Image as alcImage
 from nonebot_plugin_alconna import Match, Query, UniMsg
-from nonebot_plugin_saa import Image, MessageFactory, Text
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import Config
 from zhenxun.configs.utils import PluginExtraData
 from zhenxun.services.log import logger
+from zhenxun.utils.message import MessageUtils
 
 from ._config import scope2int, type2int
 from ._data_source import WordBankManage, get_answer, get_img_and_at_list, get_problem
@@ -96,7 +97,7 @@ async def _(
     user_id = session.id1
     group_id = session.id3 or session.id2
     if not group_id and user_id not in bot.config.superusers:
-        await Text("权限不足捏...").finish(reply=True)
+        await MessageUtils.build_message("权限不足捏...").finish(reply_to=True)
     word_scope, word_type, problem, answer = reg_group
     if not word_scope and not group_id:
         word_scope = "私聊"
@@ -105,11 +106,13 @@ async def _(
         and word_scope in ["全局", "私聊"]
         and user_id not in bot.config.superusers
     ):
-        await Text("权限不足，无法添加该范围词条...").finish(reply=True)
+        await MessageUtils.build_message("权限不足，无法添加该范围词条...").finish(
+            reply_to=True
+        )
     if (not problem or not problem.strip()) and word_type != "图片":
-        await Text("词条问题不能为空！").finish(reply=True)
+        await MessageUtils.build_message("词条问题不能为空！").finish(reply_to=True)
     if (not answer or not answer.strip()) and not len(img_list) and not len(at_list):
-        await Text("词条回答不能为空！").finish(reply=True)
+        await MessageUtils.build_message("词条回答不能为空！").finish(reply_to=True)
     if word_type != "图片":
         state["problem_image"] = "YES"
     temp_problem = message.copy()
@@ -118,7 +121,7 @@ async def _(
     # if at_list:
     answer = get_answer(message.copy())
     # text = str(message.pop(0)).split("答", maxsplit=1)[-1].strip()
-    # temp_problem.insert(0, alcText(text))
+    # temp_problem.insert(0, alcMessageUtils.build_message(text))
     state["word_scope"] = word_scope
     state["word_type"] = word_type
     state["problem"] = get_problem(temp_problem)
@@ -141,7 +144,7 @@ async def _(
     answer: Any = Arg("answer"),
 ):
     if not session.id1:
-        await Text("用户id不存在...").finish()
+        await MessageUtils.build_message("用户id不存在...").finish()
     user_id = session.id1
     group_id = session.id3 or session.id2
     try:
@@ -152,16 +155,16 @@ async def _(
             try:
                 re.compile(problem)
             except re.error:
-                await Text(f"添加词条失败，正则表达式 {problem} 非法！").finish(
-                    reply=True
-                )
+                await MessageUtils.build_message(
+                    f"添加词条失败，正则表达式 {problem} 非法！"
+                ).finish(reply_to=True)
         # if str(event.user_id) in bot.config.superusers and isinstance(event, PrivateMessageEvent):
         #     word_scope = "私聊"
         nickname = None
         if problem and bot.config.nickname:
             nickname = [nk for nk in bot.config.nickname if problem.startswith(nk)]
         if not problem:
-            await Text("获取问题失败...").finish(reply=True)
+            await MessageUtils.build_message("获取问题失败...").finish(reply_to=True)
         await WordBank.add_problem_answer(
             user_id,
             (
@@ -186,13 +189,15 @@ async def _(
             session=session,
             e=e,
         )
-        await Text(
+        await MessageUtils.build_message(
             f"添加词条 {problem if word_type != '图片' else '图片'} 发生错误！"
-        ).finish(reply=True)
+        ).finish(reply_to=True)
     if word_type == "图片":
-        result = MessageFactory([Text("添加词条 "), Image(problem), Text(" 成功！")])
+        result = MessageUtils.build_message(
+            ["添加词条 ", Image(url=problem), " 成功！"]
+        )
     else:
-        result = Text(f"添加词条 {problem} 成功！")
+        result = MessageUtils.build_message(f"添加词条 {problem} 成功！")
     await result.send()
     logger.info(
         f"添加词条 {problem} 成功！",
@@ -212,9 +217,9 @@ async def _(
     all: Query[bool] = AlconnaQuery("all.value", False),
 ):
     if not problem.available and not index.available:
-        await Text("此命令之后需要跟随指定词条或id，通过“显示词条“查看").finish(
-            reply=True
-        )
+        await MessageUtils.build_message(
+            "此命令之后需要跟随指定词条或id，通过“显示词条“查看"
+        ).finish(reply_to=True)
     word_scope = 1 if session.id3 or session.id2 else 2
     if all.result:
         word_scope = 0
@@ -228,7 +233,7 @@ async def _(
         )
     else:
         if session.id1 not in bot.config.superusers:
-            await Text("权限不足捏...").finish(reply=True)
+            await MessageUtils.build_message("权限不足捏...").finish(reply_to=True)
         result, _ = await WordBankManage.delete_word(
             problem.result,
             index.result if index.available else None,
@@ -236,7 +241,7 @@ async def _(
             None,
             word_scope,
         )
-    await Text(result).send(reply=True)
+    await MessageUtils.build_message(result).send(reply_to=True)
     logger.info(f"删除词条: {problem.result}", arparma.header_result, session=session)
 
 
@@ -251,9 +256,9 @@ async def _(
     all: Query[bool] = AlconnaQuery("all.value", False),
 ):
     if not problem.available and not index.available:
-        await Text("此命令之后需要跟随指定词条或id，通过“显示词条“查看").finish(
-            reply=True
-        )
+        await MessageUtils.build_message(
+            "此命令之后需要跟随指定词条或id，通过“显示词条“查看"
+        ).finish(reply_to=True)
     word_scope = 1 if session.id3 or session.id2 else 2
     if all.result:
         word_scope = 0
@@ -267,7 +272,7 @@ async def _(
         )
     else:
         if session.id1 not in bot.config.superusers:
-            await Text("权限不足捏...").finish(reply=True)
+            await MessageUtils.build_message("权限不足捏...").finish(reply_to=True)
         result, old_problem = await WordBankManage.update_word(
             replace,
             problem.result if problem.available else "",
@@ -275,7 +280,7 @@ async def _(
             session.id3 or session.id2,
             word_scope,
         )
-    await Text(result).send(reply=True)
+    await MessageUtils.build_message(result).send(reply_to=True)
     logger.info(
         f"更新词条词条: {old_problem} -> {replace}",
         arparma.header_result,
@@ -303,7 +308,9 @@ async def _(
             if index.result < 0 or index.result > len(
                 await WordBank.get_problem_by_scope(2)
             ):
-                await Text("id必须在范围内...").finish(reply=True)
+                await MessageUtils.build_message("id必须在范围内...").finish(
+                    reply_to=True
+                )
         result = await WordBankManage.show_word(
             problem.result,
             index.result if index.available else None,