版本更新

zhenxun/builtin_plugins/help/__init__.py

@@ -1,7 +1,7 @@
 from nonebot.rule import to_me
 from nonebot.adapters import Bot
+from nonebot_plugin_uninfo import Uninfo
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_session import EventSession
 from nonebot_plugin_alconna import (
     Args,
     Match,
@@ -58,28 +58,26 @@ _matcher = on_alconna(
 async def _(
     bot: Bot,
     name: Match[str],
-    session: EventSession,
+    session: Uninfo,
     is_superuser: Query[bool] = AlconnaQuery("superuser.value", False),
 ):
-    if not session.id1:
-        await MessageUtils.build_message("用户id为空...").finish()
     _is_superuser = is_superuser.result if is_superuser.available else False
     if name.available:
-        if _is_superuser and session.id1 not in bot.config.superusers:
+        if _is_superuser and session.user.id not in bot.config.superusers:
             _is_superuser = False
-        if result := await get_plugin_help(session.id1, name.result, _is_superuser):
+        if result := await get_plugin_help(session.user.id, name.result, _is_superuser):
             await MessageUtils.build_message(result).send(reply_to=True)
         else:
             await MessageUtils.build_message("没有此功能的帮助信息...").send(
                 reply_to=True
             )
         logger.info(f"查看帮助详情: {name.result}", "帮助", session=session)
-    elif gid := session.id3 or session.id2:
+    elif session.group and (gid := session.group.id):
         _image_path = GROUP_HELP_PATH / f"{gid}.png"
         if not _image_path.exists():
-            await create_help_img(bot.self_id, gid, session.platform)
+            await create_help_img(session, gid)
         await MessageUtils.build_message(_image_path).finish()
     else:
         if not SIMPLE_HELP_IMAGE.exists():
-            await create_help_img(bot.self_id, None, session.platform)
+            await create_help_img(session, None)
         await MessageUtils.build_message(SIMPLE_HELP_IMAGE).finish()

zhenxun/builtin_plugins/help/_data_source.py

@@ -1,4 +1,5 @@
 import nonebot
+from nonebot_plugin_uninfo import Uninfo
 
 from zhenxun.utils.enum import PluginType
 from zhenxun.models.level_user import LevelUser
@@ -19,19 +20,18 @@ background = IMAGE_PATH / "background" / "0.png"
 driver = nonebot.get_driver()
 
 
-async def create_help_img(bot_id: str, group_id: str | None, platform: str):
+async def create_help_img(session: Uninfo, group_id: str | None):
     """生成帮助图片
 
     参数:
-        bot_id: bot id
+        session: Uninfo
         group_id: 群号
-        platform: 平台
     """
     help_type: str = base_config.get("type")
     if help_type.lower() == "html":
         result = BuildImage.open(await build_html_image(group_id))
     elif help_type.lower() == "zhenxun":
-        result = BuildImage.open(await build_zhenxun_image(bot_id, group_id, platform))
+        result = BuildImage.open(await build_zhenxun_image(session, group_id))
     else:
         result = await build_normal_image(group_id)
     if group_id:

zhenxun/builtin_plugins/help/zhenxun_help.py

@@ -1,7 +1,9 @@
 from pydantic import BaseModel
+from nonebot_plugin_uninfo import Uninfo
 from nonebot_plugin_htmlrender import template_to_pic
 
 from zhenxun.utils.enum import BlockType
+from zhenxun.configs.config import BotConfig
 from zhenxun.utils.platform import PlatformUtils
 from zhenxun.models.plugin_info import PluginInfo
 from zhenxun.configs.path_config import TEMPLATE_PATH
@@ -60,12 +62,21 @@ def build_plugin_data(classify: dict[str, list[Item]]) -> list[dict[str, str]]:
         for menu, value in classify.items()
     ]
     plugin_list = build_line_data(plugin_list)
-    plugin_list.insert(0, build_plugin_line(menu_key, max_data, 30, 100))
+    plugin_list.insert(
+        0,
+        build_plugin_line(
+            menu_key if menu_key not in ["normal", "功能"] else "主要功能",
+            max_data,
+            30,
+            100,
+            True,
+        ),
+    )
     return plugin_list
 
 
 def build_plugin_line(
-    name: str, items: list, left: int, width: int | None = None
+    name: str, items: list, left: int, width: int | None = None, is_max: bool = False
 ) -> dict:
     """构造插件行数据
 
@@ -74,13 +85,14 @@ def build_plugin_line(
         items: 插件名称列表
         left: 左边距
         width: 总插件长度.
+        is_max: 是否为最大长度的插件菜单
 
     返回:
         dict: 插件数据
     """
     _plugins = []
     width = width or 50
-    if len(items) // 2 > 6:
+    if len(items) // 2 > 6 or is_max:
         width = 100
         plugin_list1 = []
         plugin_list2 = []
@@ -113,25 +125,25 @@ def build_line_data(plugin_list: list[dict]) -> list[dict]:
     return data
 
 
-async def build_zhenxun_image(
-    bot_id: str, group_id: str | None, platform: str
-) -> bytes:
+async def build_zhenxun_image(session: Uninfo, group_id: str | None) -> bytes:
     """构造真寻帮助图片
 
     参数:
         bot_id: bot_id
         group_id: 群号
-        platform: 平台
     """
     classify = await classify_plugin(group_id, __handle_item)
     plugin_list = build_plugin_data(classify)
+    platform = PlatformUtils.get_platform(session)
+    bot_id = BotConfig.get_qbot_uid(session.self_id) or session.self_id
+    bot_ava = PlatformUtils.get_user_avatar_url(bot_id, platform)
     return await template_to_pic(
         template_path=str((TEMPLATE_PATH / "ss_menu").absolute()),
         template_name="main.html",
         templates={
             "data": {
                 "plugin_list": plugin_list,
-                "ava": PlatformUtils.get_user_avatar_url(bot_id, platform),
+                "ava": bot_ava,
             }
         },
         pages={