🎨 统一发送格式

zhenxun/plugins/wbtop/__init__.py

@@ -1,12 +1,12 @@
 from nonebot.plugin import PluginMetadata
 from nonebot_plugin_alconna import Alconna, Args, Arparma, Match, on_alconna
-from nonebot_plugin_saa import Image, Text
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.path_config import IMAGE_PATH
 from zhenxun.configs.utils import PluginExtraData
 from zhenxun.services.log import logger
 from zhenxun.utils.http_utils import AsyncPlaywright
+from zhenxun.utils.message import MessageUtils
 
 from .data_source import get_hot_image
 
@@ -33,7 +33,7 @@ _matcher = on_alconna(Alconna("微博热搜", Args["idx?", int]), priority=5, bl
 async def _(session: EventSession, arparma: Arparma, idx: Match[int]):
     result, data_list = await get_hot_image()
     if isinstance(result, str):
-        await Text(result).finish(reply=True)
+        await MessageUtils.build_message(result).finish(reply=True)
     if idx.available:
         _idx = idx.result
         url = data_list[_idx - 1]["url"]
@@ -45,12 +45,12 @@ async def _(session: EventSession, arparma: Arparma, idx: Match[int]):
             wait_time=12,
         )
         if img:
-            await Image(file).send()
+            await MessageUtils.build_message(file).send()
             logger.info(
                 f"查询微博热搜 Id: {_idx}", arparma.header_result, session=session
             )
         else:
-            await Text("获取图片失败...").send()
+            await MessageUtils.build_message("获取图片失败...").send()
     else:
-        await Image(result.pic2bytes()).send()
+        await MessageUtils.build_message(result).send()
         logger.info(f"查询微博热搜", arparma.header_result, session=session)

zhenxun/plugins/wbtop/data_source.py

@@ -50,11 +50,11 @@ async def get_hot_image() -> tuple[BuildImage | str, list]:
     await bk.paste(wbtop_bk)
     text_bk = BuildImage(700, 32 * 50, color="#797979")
     image_list = []
-    for i, data in enumerate(data):
-        title = f"{i + 1}. {data['hot_word']}"
-        hot = str(data["hot_word_num"])
+    for i, _data in enumerate(data):
+        title = f"{i + 1}. {_data['hot_word']}"
+        hot = str(_data["hot_word_num"])
         img = BuildImage(700, 30, font_size=20)
-        w, h = img.getsize(title)
+        _, h = img.getsize(title)
         await img.text((10, int((30 - h) / 2)), title)
         await img.text((580, int((30 - h) / 2)), hot)
         image_list.append(img)