From 3e32ca3964ff8f40e0b491e87f153040f2348fd0 Mon Sep 17 00:00:00 2001
From: Kyomotoi <kyomotoiowo@gmail.com>
Date: Thu, 3 Feb 2022 14:36:24 +0800
Subject: =?UTF-8?q?=F0=9F=94=96=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新记录请参考文档: atri.kyomotoi.moe/changelog/overview/
---
 ATRI/plugins/help/__init__.py    | 11 +++++------
 ATRI/plugins/help/data_source.py |  6 ++----
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'ATRI/plugins/help')

diff --git a/ATRI/plugins/help/__init__.py b/ATRI/plugins/help/__init__.py
index 1d1102e..a8465bc 100644
--- a/ATRI/plugins/help/__init__.py
+++ b/ATRI/plugins/help/__init__.py
@@ -1,5 +1,4 @@
-from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, MessageEvent
+from nonebot.adapters.onebot.v11 import MessageEvent
 
 from ATRI.rule import to_bot
 from .data_source import Helper
@@ -9,7 +8,7 @@ main_help = Helper().on_command("菜单", "获取食用bot的方法", rule=to_bo
 
 
 @main_help.handle()
-async def _main_help(bot: Bot, event: MessageEvent):
+async def _main_help():
     repo = Helper().menu()
     await main_help.finish(repo)
 
@@ -18,7 +17,7 @@ about_me = Helper().on_command("关于", "获取关于bot的信息", rule=to_bot
 
 
 @about_me.handle()
-async def _about_me(bot: Bot, event: MessageEvent):
+async def _about_me():
     repo = Helper().about()
     await about_me.finish(repo)
 
@@ -27,7 +26,7 @@ service_list = Helper().on_command("服务列表", "查看所有可用服务", r
 
 
 @service_list.handle()
-async def _service_list(bot: Bot, event: MessageEvent):
+async def _service_list():
     repo = Helper().service_list()
     await service_list.finish(repo)
 
@@ -36,7 +35,7 @@ service_info = Helper().on_command("帮助", "获取服务详细帮助", aliases
 
 
 @service_info.handle()
-async def _ready_service_info(bot: Bot, event: MessageEvent, state: T_State):
+async def _ready_service_info(event: MessageEvent):
     msg = str(event.message).split(" ")
     service = msg[0]
     try:
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index 7b2f6f8..cfa0c62 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -34,7 +34,7 @@ class Helper(Service):
             "关于 -查看bot基本信息\n"
             "服务列表 -以查看所有可用服务\n"
             "帮助 [服务] -以查看对应服务帮助\n"
-            "Tip: 均需要at触发。菜单 以打开此页面"
+            "Tip: 均需要at触发。@bot 菜单 以打开此页面"
         )
 
     @staticmethod
@@ -59,10 +59,8 @@ class Helper(Service):
             service = i.replace(".json", "")
             temp_list.append(service)
 
-        msg0 = "咱搭载了以下服务~\n"
         services = "、".join(map(str, temp_list))
-        msg0 = msg0 + services
-        repo = msg0 + "\n@ 帮助 [服务] -以查看对应服务帮助"
+        repo = f"咱搭载了以下服务~\n{services}\n@bot 帮助 [服务] -以查看对应服务帮助"
         return repo
 
     @staticmethod
-- 
cgit v1.2.3