Merge pull request #5 from Kyomotoi/main

sync main

2 files changed, 14 insertions, 17 deletions

diff --git a/ATRI/plugins/help/__init__.py b/ATRI/plugins/help/__init__.py
index d4b8b36..c6f915e 100644
--- a/ATRI/plugins/help/__init__.py
+++ b/ATRI/plugins/help/__init__.py
@@ -3,34 +3,31 @@ from nonebot.adapters.onebot.v11 import MessageEvent
 from .data_source import Helper
 
 
-main_help = Helper().on_command("菜单", "获取食用bot的方法", aliases={"menu"})
+menu = Helper().on_command("菜单", "获取食用bot的方法", aliases={"menu"})
 
 
-@main_help.handle()
-async def _main_help():
-    repo = Helper().menu()
-    await main_help.finish(repo)
[email protected]()
+async def _():
+    await menu.finish(Helper().menu())
 
 
-about_me = Helper().on_command("关于", "获取关于bot的信息", aliases={"about"})
+about = Helper().on_command("关于", "获取关于bot的信息", aliases={"about"})
 
 
-@about_me.handle()
-async def _about_me():
-    repo = Helper().about()
-    await about_me.finish(repo)
[email protected]()
+async def _():
+    await about.finish(Helper().about())
 
 
-service_list = Helper().on_command("服务列表", "查看所有可用服务", aliases={"功能列表"})
+service_list = Helper().on_command("服务列表", "获取服务列表", aliases={"功能列表"})
 
 
 @service_list.handle()
-async def _service_list():
-    repo = Helper().service_list()
-    await service_list.finish(repo)
+async def _():
+    await service_list.finish(Helper().service_list())
 
 
-service_info = Helper().on_command("帮助", "获取服务详细帮助", aliases={"help"})
+service_info = Helper().on_command("帮助", "获取对应服务详细信息", aliases={"help"})
 
 
 @service_info.handle()
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index f96d59e..e3dd1ff 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -72,7 +72,7 @@ class Helper(Service):
                 )
         table = tabulate(
             services,
-            headers=["服务名称", "开启状态", "仅支持管理员"],
+            headers=["服务名称", "开启状态(全局)", "仅支持管理员"],
             tablefmt="plain",
             showindex=True,
         )
@@ -91,7 +91,7 @@ class Helper(Service):
         service_enabled = data.get("enabled", True)
 
         _service_cmd_list = list(data.get("cmd_list", {"error"}))
-        service_cmd_list = "、".join(map(str, _service_cmd_list))
+        service_cmd_list = "\n".join(map(str, _service_cmd_list))
 
         repo = SERVICE_INFO_FORMAT.format(
             service=service_name,