♻️ 跟进 service 的变化

2 files changed, 15 insertions, 12 deletions

diff --git a/ATRI/plugins/help/__init__.py b/ATRI/plugins/help/__init__.py
index a9663eb..4f302c9 100644
--- a/ATRI/plugins/help/__init__.py
+++ b/ATRI/plugins/help/__init__.py
@@ -1,9 +1,15 @@
 from nonebot.adapters.onebot.v11 import MessageEvent
 
+from ATRI.service import Service
+from ATRI.rule import to_bot
+
 from .data_source import Helper
 
 
-menu = Helper().on_command("菜单", "获取食用bot的方法", aliases={"menu"})
+plugin = Service("帮助").document("bot的食用指南~").rule(to_bot())
+
+
+menu = plugin.on_command("菜单", "获取食用bot的方法", aliases={"menu"})
 
 
 @menu.handle()
@@ -11,7 +17,7 @@ async def _():
     await menu.finish(Helper().menu())
 
 
-about = Helper().on_command("关于", "获取关于bot的信息", aliases={"about"})
+about = plugin.on_command("关于", "获取关于bot的信息", aliases={"about"})
 
 
 @about.handle()
@@ -19,7 +25,7 @@ async def _():
     await about.finish(Helper().about())
 
 
-service_list = Helper().on_command("服务列表", "获取服务列表", aliases={"功能列表"})
+service_list = plugin.on_command("服务列表", "获取服务列表", aliases={"功能列表"})
 
 
 @service_list.handle()
@@ -27,7 +33,7 @@ async def _():
     await service_list.finish(Helper().service_list())
 
 
-service_info = Helper().on_command("帮助", "获取对应服务详细信息", aliases={"help"})
+service_info = plugin.on_command("帮助", "获取对应服务详细信息", aliases={"help"})
 
 
 @service_info.handle()
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index 7492197..6261a05 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -4,9 +4,8 @@ import json
 from tabulate import tabulate
 
 from ATRI import __version__, conf
-from ATRI.rule import to_bot
 from ATRI.message import MessageBuilder
-from ATRI.service import Service, SERVICES_DIR, ServiceTools
+from ATRI.service import SERVICES_DIR, ServiceTools
 
 
 __SERVICE_INFO_FORMAT = (
@@ -26,10 +25,7 @@ __COMMAND_INFO_FORMAT = (
 )
 
 
-class Helper(Service):
-    def __init__(self):
-        Service.__init__(self, "帮助", "bot的食用指南~", rule=to_bot())
-
+class Helper:
     @staticmethod
     def menu() -> str:
         return (
@@ -38,6 +34,7 @@ class Helper(Service):
             .text("服务列表 -以查看所有可用服务")
             .text("帮助 [服务] -以查看对应服务帮助")
             .text("Tip: 均需要at触发。@bot 菜单 以打开此页面")
+            .done()
         )
 
     @staticmethod
@@ -53,6 +50,7 @@ class Helper(Service):
             .text("想进一步了解:")
             .text("atri.imki.moe")
             .text("进不去: project-atri-docs.vercel.app")
+            .done()
         )
 
     @staticmethod
@@ -76,8 +74,7 @@ class Helper(Service):
             headers=["服务名称", "开启状态(全局)", "仅支持管理员"],
             tablefmt="plain",
         )
-        repo = f"咱搭载了以下服务~\n{table}\n@bot 帮助 [服务] -以查看对应服务帮助"
-        return MessageBuilder("咱搭载了以下服务~").text(table).text("@bot 帮助 [服务] -以查看对应服务帮助")
+        return MessageBuilder("咱搭载了以下服务~").text(table).text("@bot 帮助 [服务] -以查看对应服务帮助").done()
 
     @staticmethod
     def service_info(service: str) -> str: