✨ 新版帮助ui

zhenxun/builtin_plugins/help/__init__.py

@@ -1,27 +1,26 @@
+from nonebot.rule import to_me
 from nonebot.adapters import Bot
 from nonebot.plugin import PluginMetadata
-from nonebot.rule import to_me
+from nonebot_plugin_session import EventSession
 from nonebot_plugin_alconna import (
-    Alconna,
-    AlconnaQuery,
     Args,
     Match,
-    Option,
     Query,
+    Option,
+    Alconna,
+    AlconnaQuery,
     on_alconna,
     store_true,
 )
-from nonebot_plugin_session import EventSession
 
-from zhenxun.configs.path_config import IMAGE_PATH
-from zhenxun.configs.utils import PluginExtraData, RegisterConfig
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
-from zhenxun.utils.image_utils import BuildImage
 from zhenxun.utils.message import MessageUtils
+from zhenxun.configs.path_config import IMAGE_PATH
+from zhenxun.configs.utils import RegisterConfig, PluginExtraData
 
-from ._data_source import create_help_img, get_plugin_help
 from ._utils import GROUP_HELP_PATH
+from ._data_source import create_help_img, get_plugin_help
 
 __plugin_meta__ = PluginMetadata(
     name="帮助",
@@ -35,8 +34,8 @@ __plugin_meta__ = PluginMetadata(
             RegisterConfig(
                 key="type",
                 value="normal",
-                help="帮助图片样式 ['normal', 'HTML']",
-                default_value="normal",
+                help="帮助图片样式 ['normal', 'HTML', 'zhenxun']",
+                default_value="zhenxun",
             )
         ],
     ).dict(),
@@ -67,36 +66,25 @@ async def _(
     session: EventSession,
     is_superuser: Query[bool] = AlconnaQuery("superuser.value", False),
 ):
-    logger.debug("进入help")
-    _is_superuser = False
-    if is_superuser.available:
-        _is_superuser = is_superuser.result
+    _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:
             _is_superuser = False
         if result := await get_plugin_help(name.result, _is_superuser):
-            if isinstance(result, BuildImage):
-                await MessageUtils.build_message(result).send(reply_to=True)
-            else:
-                await MessageUtils.build_message(result).send(reply_to=True)
+            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,
-        )
+        logger.info(f"查看帮助详情: {name.result}", "帮助", session=session)
+    elif gid := session.id3 or session.id2:
+        _image_path = GROUP_HELP_PATH / f"{gid}.png"
+        if not _image_path.exists():
+            await create_help_img(bot.self_id, gid)
+        await MessageUtils.build_message(_image_path).finish()
     else:
-        if gid := session.id3 or session.id2:
-            _image_path = GROUP_HELP_PATH / f"{gid}.png"
-            if not _image_path.exists():
-                await create_help_img(gid)
-            await MessageUtils.build_message(_image_path).finish()
-        else:
-            if not SIMPLE_HELP_IMAGE.exists():
-                if SIMPLE_HELP_IMAGE.exists():
-                    SIMPLE_HELP_IMAGE.unlink()
-                await create_help_img(None)
-            await MessageUtils.build_message(SIMPLE_HELP_IMAGE).finish()
+        if not SIMPLE_HELP_IMAGE.exists():
+            if SIMPLE_HELP_IMAGE.exists():
+                SIMPLE_HELP_IMAGE.unlink()
+            await create_help_img(bot.self_id, None)
+        await MessageUtils.build_message(SIMPLE_HELP_IMAGE).finish()