From d7e684e8e51d923608f5ddfa9dea0457363dc5d3 Mon Sep 17 00:00:00 2001 From: AzideCupric <57004769+AzideCupric@users.noreply.github.com> Date: Sat, 18 Feb 2023 19:51:19 +0800 Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E8=B0=83=E6=95=B4=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BB=A5=E4=BC=98=E5=8C=96=E7=BE=A4=E5=86=85=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit style(admin-page): 为`后台管理`命令添加别名 test: 调整相关测试的文本 --- src/plugins/nonebot_bison/admin_page/__init__.py | 2 +- src/plugins/nonebot_bison/config_manager.py | 6 +++--- tests/utils.py | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/plugins/nonebot_bison/admin_page/__init__.py b/src/plugins/nonebot_bison/admin_page/__init__.py index 199f7ba..9938224 100644 --- a/src/plugins/nonebot_bison/admin_page/__init__.py +++ b/src/plugins/nonebot_bison/admin_page/__init__.py @@ -70,7 +70,7 @@ def init(): if (STATIC_PATH / "index.html").exists(): init() - get_token = on_command("后台管理", rule=to_me(), priority=5) + get_token = on_command("后台管理", rule=to_me(), priority=5, aliases={"管理后台"}) @get_token.handle() async def send_token(bot: "Bot", event: PrivateMessageEvent, state: T_State): diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index a9678fd..1366646 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -182,7 +182,7 @@ def do_add_sub(add_sub: Type[Matcher]): if not platform_manager[state["platform"]].enable_tag: state["tags"] = [] return - state["_prompt"] = '请输入要订阅/屏蔽的tag(不含#号)\n多个tag请使用空格隔开\n具体规则回复"详情"' + state["_prompt"] = '请输入要订阅/屏蔽的标签(不含#号)\n多个标签请使用空格隔开\n订阅所有标签输入"全部标签"\n具体规则回复"详情"' async def parser_tags(event: MessageEvent, state: T_State): if not isinstance(state["tags"], Message): @@ -191,9 +191,9 @@ def do_add_sub(add_sub: Type[Matcher]): await add_sub.finish("已中止订阅") if str(event.get_message()).strip() == "详情": await add_sub.reject( - '订阅tag直接输入tag内容\n订阅所有tag输入"全部标签"\n屏蔽tag请在tag名称前添加~号\n详见https://nonebot-bison.netlify.app/usage/#平台订阅标签-tag' + "订阅标签直接输入标签内容\n屏蔽标签请在标签名称前添加~号\n详见https://nonebot-bison.netlify.app/usage/#%E5%B9%B3%E5%8F%B0%E8%AE%A2%E9%98%85%E6%A0%87%E7%AD%BE-tag" ) - if str(event.get_message()).strip() == "全部标签": + if str(event.get_message()).strip() in ["全部标签", "全部", "全标签"]: state["tags"] = [] else: state["tags"] = str(event.get_message()).strip().split() diff --git a/tests/utils.py b/tests/utils.py index 003ed07..38afb26 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,3 @@ -from ast import Str from typing import TYPE_CHECKING from typing_extensions import Literal @@ -132,7 +131,7 @@ class BotReply: return "添加 {} 成功".format(name) @staticmethod - def add_reply_on_id(platform: object) -> Str: + def add_reply_on_id(platform: object) -> str: base_text = "请输入订阅用户的id\n查询id获取方法请回复:“查询”" extra_text = ( ("1." + platform.parse_target_promot + "\n2.") @@ -144,6 +143,6 @@ class BotReply: add_reply_on_id_input_error = "id输入错误" add_reply_on_target_parse_input_error = "不能从你的输入中提取出id，请检查你输入的内容是否符合预期" add_reply_on_platform_input_error = "平台输入错误" - add_reply_on_tags = '请输入要订阅/屏蔽的tag(不含#号)\n多个tag请使用空格隔开\n具体规则回复"详情"' - add_reply_on_tags_need_more_info = '订阅tag直接输入tag内容\n订阅所有tag输入"全部标签"\n屏蔽tag请在tag名称前添加~号\n详见https://nonebot-bison.netlify.app/usage/#平台订阅标签-tag' + add_reply_on_tags = '请输入要订阅/屏蔽的标签(不含#号)\n多个标签请使用空格隔开\n订阅所有标签输入"全部标签"\n具体规则回复"详情"' + add_reply_on_tags_need_more_info = "订阅标签直接输入标签内容\n屏蔽标签请在标签名称前添加~号\n详见https://nonebot-bison.netlify.app/usage/#%E5%B9%B3%E5%8F%B0%E8%AE%A2%E9%98%85%E6%A0%87%E7%AD%BE-tag" add_reply_abort = "已中止订阅"