diff options
Diffstat (limited to 'ATRI/plugins/help')
-rw-r--r-- | ATRI/plugins/help/__init__.py | 11 | ||||
-rw-r--r-- | ATRI/plugins/help/data_source.py | 6 |
2 files changed, 7 insertions, 10 deletions
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 |