From 410c9619d5582d657f2754b32ee15592b254bf65 Mon Sep 17 00:00:00 2001 From: Azide Date: Mon, 14 Mar 2022 20:04:14 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86group=5Fmanage?= =?UTF-8?q?=5Fmatcher=E7=9A=84=E9=87=8D=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/nonebot_bison/config_manager.py | 5 +++- tests/test_config_manager_admin.py | 26 +++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index ee5ebf9..9e59b2b 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -12,7 +12,7 @@ from nonebot.internal.params import ArgStr from nonebot.internal.rule import Rule from nonebot.log import logger from nonebot.matcher import Matcher -from nonebot.params import Depends, EventMessage, EventPlainText, EventToMe +from nonebot.params import Depends, EventMessage, EventPlainText, EventToMe, EventType from nonebot.permission import SUPERUSER from nonebot.rule import to_me from nonebot.typing import T_State @@ -296,6 +296,9 @@ do_del_sub(del_sub_matcher) group_manage_matcher = on_command("群管理") +@group_manage_matcher.handle() +async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State): + await group_manage_matcher.finish(Message("该功能只支持私聊使用，请私聊Bot")) @group_manage_matcher.handle() async def send_group_list(bot: Bot, state: T_State): diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index fc6581d..77e9ac1 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -1,9 +1,11 @@ from nonebug import App -from .utils import fake_admin_user, fake_private_message_event, fake_superuser +from .utils import fake_admin_user, fake_private_message_event, fake_group_message_event, fake_superuser +import pytest -async def test_query(app: App): +@pytest.mark.asyncio +async def test_query_with_superuser_private(app: App): from nonebot.adapters.onebot.v11.bot import Bot from nonebot.adapters.onebot.v11.message import Message from nonebot_bison.config_manager import group_manage_matcher @@ -43,3 +45,23 @@ async def test_query(app: App): message=Message("查询订阅"), sender=fake_superuser ) ctx.receive_event(bot, event_2_ok) + ctx.should_pass_rule() + ctx.should_pass_permission() + +@pytest.mark.asyncio +async def test_query_with_superuser_group_tome(app: App): + from nonebot.adapters.onebot.v11.bot import Bot + from nonebot.adapters.onebot.v11.message import Message + from nonebot_bison.config_manager import group_manage_matcher + + async with app.test_matcher(group_manage_matcher) as ctx: + bot = ctx.create_bot(base=Bot) + event = fake_group_message_event( + message=Message("群管理"), sender=fake_superuser,to_me=True + ) + ctx.receive_event(bot, event) + ctx.should_pass_rule() + ctx.should_pass_permission() + ctx.should_call_send( + event, '', True + ) \ No newline at end of file From 574e4916284b6c0f565084b9de1c71365fea6b47 Mon Sep 17 00:00:00 2001 From: Azide Date: Mon, 14 Mar 2022 17:46:27 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/nonebot_bison/config_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index 9e59b2b..e701779 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -294,14 +294,14 @@ del_sub_matcher = on_command( del_sub_matcher.handle()(set_target_user_info) do_del_sub(del_sub_matcher) -group_manage_matcher = on_command("群管理") +group_manage_matcher = on_command("群管理",rule=to_me(),permission=SUPERUSER,priority=4) @group_manage_matcher.handle() async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State): await group_manage_matcher.finish(Message("该功能只支持私聊使用，请私聊Bot")) @group_manage_matcher.handle() -async def send_group_list(bot: Bot, state: T_State): +async def send_group_list(bot: Bot, event: PrivateMessageEvent, state: T_State): groups = await bot.call_api("get_group_list") res_text = "请选择需要管理的群：\n" group_number_idx = {} From dae092402dfe6ef27990dd2ab32ec64b738ee369 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 13:01:10 +0000 Subject: [PATCH 03/18] auto fix by pre-commit hooks --- src/plugins/nonebot_bison/config_manager.py | 4 +++- tests/test_config_manager_admin.py | 16 ++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index e701779..7e7255e 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -294,12 +294,14 @@ del_sub_matcher = on_command( del_sub_matcher.handle()(set_target_user_info) do_del_sub(del_sub_matcher) -group_manage_matcher = on_command("群管理",rule=to_me(),permission=SUPERUSER,priority=4) +group_manage_matcher = on_command("群管理", rule=to_me(), permission=SUPERUSER, priority=4) + @group_manage_matcher.handle() async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State): await group_manage_matcher.finish(Message("该功能只支持私聊使用，请私聊Bot")) + @group_manage_matcher.handle() async def send_group_list(bot: Bot, event: PrivateMessageEvent, state: T_State): groups = await bot.call_api("get_group_list") diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 77e9ac1..877edbf 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -1,8 +1,13 @@ +import pytest from nonebug import App -from .utils import fake_admin_user, fake_private_message_event, fake_group_message_event, fake_superuser +from .utils import ( + fake_admin_user, + fake_group_message_event, + fake_private_message_event, + fake_superuser, +) -import pytest @pytest.mark.asyncio async def test_query_with_superuser_private(app: App): @@ -48,6 +53,7 @@ async def test_query_with_superuser_private(app: App): ctx.should_pass_rule() ctx.should_pass_permission() + @pytest.mark.asyncio async def test_query_with_superuser_group_tome(app: App): from nonebot.adapters.onebot.v11.bot import Bot @@ -57,11 +63,9 @@ async def test_query_with_superuser_group_tome(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_group_message_event( - message=Message("群管理"), sender=fake_superuser,to_me=True + message=Message("群管理"), sender=fake_superuser, to_me=True ) ctx.receive_event(bot, event) ctx.should_pass_rule() ctx.should_pass_permission() - ctx.should_call_send( - event, '', True - ) \ No newline at end of file + ctx.should_call_send(event, "", True) From 08387943bafa6b68707cac1425c171732de5eaef Mon Sep 17 00:00:00 2001 From: Azide Date: Mon, 14 Mar 2022 22:31:22 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + tests/test_config_manager_admin.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b8f3e5..0753ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ __pycache__/ *.py[cod] *$py.class +venv_test/ # C extensions *.so diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 77e9ac1..47c32b4 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -1,7 +1,10 @@ +import imp from nonebug import App from .utils import fake_admin_user, fake_private_message_event, fake_group_message_event, fake_superuser +from .conftest import app + import pytest @pytest.mark.asyncio @@ -63,5 +66,5 @@ async def test_query_with_superuser_group_tome(app: App): ctx.should_pass_rule() ctx.should_pass_permission() ctx.should_call_send( - event, '', True + event, Message("该功能只支持私聊使用，请私聊Bot"), True ) \ No newline at end of file From a671264c39145f580b58b6a54cef692467d1071d Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Mon, 14 Mar 2022 23:26:50 +0800 Subject: [PATCH 05/18] fix some bug --- tests/test_config_manager_admin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 877edbf..c130f71 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -18,7 +18,10 @@ async def test_query_with_superuser_private(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_private_message_event( - message=Message("群管理"), sender=fake_superuser + message=Message("群管理"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event) ctx.should_pass_rule() From a6321cdf4092ccf144e2f3fc2ed55328eca610bf Mon Sep 17 00:00:00 2001 From: Azide Date: Mon, 14 Mar 2022 23:47:42 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86test=5Fconfig?= =?UTF-8?q?=5Fmanager=5Fadmin=E4=B8=AD=E7=9A=84test=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_config_manager_admin.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 47c32b4..5daabdd 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -1,4 +1,4 @@ -import imp + from nonebug import App from .utils import fake_admin_user, fake_private_message_event, fake_group_message_event, fake_superuser @@ -16,7 +16,7 @@ async def test_query_with_superuser_private(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_private_message_event( - message=Message("群管理"), sender=fake_superuser + message=Message("群管理"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event) ctx.should_pass_rule() @@ -28,24 +28,24 @@ async def test_query_with_superuser_private(app: App): event, Message("请选择需要管理的群：\n1. 101 - test group\n请输入左侧序号"), True ) event_1_err = fake_private_message_event( - message=Message("0"), sender=fake_superuser + message=Message("0"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event_1_err) - ctx.should_rejected() ctx.should_call_send(event_1_err, "请输入正确序号", True) + ctx.should_rejected() event_1_ok = fake_private_message_event( - message=Message("1"), sender=fake_superuser + message=Message("1"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event_1_ok) ctx.should_call_send(event_1_ok, "请输入需要使用的命令：添加订阅，查询订阅，删除订阅", True) event_2_err = fake_private_message_event( - message=Message("222"), sender=fake_superuser + message=Message("222"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event_2_err) - ctx.should_rejected() ctx.should_call_send(event_2_err, "请输入正确的命令", True) + ctx.should_rejected() event_2_ok = fake_private_message_event( - message=Message("查询订阅"), sender=fake_superuser + message=Message("查询订阅"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event_2_ok) ctx.should_pass_rule() @@ -60,7 +60,7 @@ async def test_query_with_superuser_group_tome(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_group_message_event( - message=Message("群管理"), sender=fake_superuser,to_me=True + message=Message("群管理"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id ) ctx.receive_event(bot, event) ctx.should_pass_rule() From 1f0f452cd1ce3b7bd650897ac9bdc4e3ccd7bf9a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Mar 2022 16:00:42 +0000 Subject: [PATCH 07/18] auto fix by pre-commit hooks --- tests/test_config_manager_admin.py | 34 ++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 36d6637..09371a6 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -18,7 +18,10 @@ async def test_query_with_superuser_private(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_private_message_event( - message=Message("群管理"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("群管理"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event) ctx.should_pass_rule() @@ -30,24 +33,36 @@ async def test_query_with_superuser_private(app: App): event, Message("请选择需要管理的群：\n1. 101 - test group\n请输入左侧序号"), True ) event_1_err = fake_private_message_event( - message=Message("0"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("0"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event_1_err) ctx.should_call_send(event_1_err, "请输入正确序号", True) ctx.should_rejected() event_1_ok = fake_private_message_event( - message=Message("1"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("1"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event_1_ok) ctx.should_call_send(event_1_ok, "请输入需要使用的命令：添加订阅，查询订阅，删除订阅", True) event_2_err = fake_private_message_event( - message=Message("222"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("222"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event_2_err) ctx.should_call_send(event_2_err, "请输入正确的命令", True) ctx.should_rejected() event_2_ok = fake_private_message_event( - message=Message("查询订阅"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("查询订阅"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event_2_ok) ctx.should_pass_rule() @@ -63,11 +78,12 @@ async def test_query_with_superuser_group_tome(app: App): async with app.test_matcher(group_manage_matcher) as ctx: bot = ctx.create_bot(base=Bot) event = fake_group_message_event( - message=Message("群管理"), sender=fake_superuser,to_me=True,user_id=fake_superuser.user_id + message=Message("群管理"), + sender=fake_superuser, + to_me=True, + user_id=fake_superuser.user_id, ) ctx.receive_event(bot, event) ctx.should_pass_rule() ctx.should_pass_permission() - ctx.should_call_send( - event, Message("该功能只支持私聊使用，请私聊Bot"), True - ) + ctx.should_call_send(event, Message("该功能只支持私聊使用，请私聊Bot"), True) From eaf76a65068e324cac7f9be9e0f07c368016b424 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Tue, 15 Mar 2022 23:23:38 +0800 Subject: [PATCH 08/18] update --- tests/test_config_manager_admin.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test_config_manager_admin.py b/tests/test_config_manager_admin.py index 09371a6..51d7e35 100644 --- a/tests/test_config_manager_admin.py +++ b/tests/test_config_manager_admin.py @@ -1,12 +1,7 @@ import pytest from nonebug import App -from .utils import ( - fake_admin_user, - fake_group_message_event, - fake_private_message_event, - fake_superuser, -) +from .utils import fake_group_message_event, fake_private_message_event, fake_superuser @pytest.mark.asyncio From 0d67d46fc6fb2ba3b59b96c9bd3ae6889afdd1d5 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Tue, 15 Mar 2022 23:44:59 +0800 Subject: [PATCH 09/18] update doc file --- docs/dev/README.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/dev/README.md b/docs/dev/README.md index f69fe22..945e47c 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -2,7 +2,32 @@ sidebar: auto --- -# 开发指南 +# 基本开发须知 + +## 语言以及工具 + +1. 本项目使用了`python3.9`的特性进行开发，所以请确保你的 Python 版本>=3.9 +2. 本项目使用 poetry 进行依赖管理，请确保开发之前已经进行过`poetry install`，运行时在`poetry shell`的环境中进行运行 +3. 本项目使用的 node 项目管理工具是 yarn + +## 前端 + +本项目使用了前端，如果单独 clone 仓库本身，里面是**不包含**编译过的前端的，请使用`yarn && yarn build`进行前端的构建。 +如果想要开发前端，推荐在`.env.dev`中加入`BISON_OUTER_URL="http://localhost:3000/bison/"`，然后分别运行 bot 和`yarn dev` +::: warning +请在开发前端的时候删除项目根目录中的`node_modules`，否则编译和运行的时候可能会出现奇怪的问题。 +::: + +## 文档 + +文档的相关部分在`docs`目录中，可以在项目根目录执行`yarn docs:dev`预览文件更改效果。 + +## 代码格式 + +本项目使用了 pre-commit 来进行代码美化和格式化。在`poetry shell`状态下执行`pre-commit install`来安装 git hook，可自动在 commit 时 +格式化代码。 + +# 适配新网站 本插件需要你的帮助！只需要会写简单的爬虫，就能给本插件适配新的网站。 From f34cdaa211d21fdf1b9230a826d768f62cecaed9 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Wed, 16 Mar 2022 22:31:33 +0800 Subject: [PATCH 10/18] update config_manager --- src/plugins/nonebot_bison/config_manager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index afb4f3b..6c184a1 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -1,5 +1,4 @@ import asyncio -from asyncio.tasks import Task from datetime import datetime from typing import Optional, Type @@ -12,7 +11,7 @@ from nonebot.internal.params import ArgStr from nonebot.internal.rule import Rule from nonebot.log import logger from nonebot.matcher import Matcher -from nonebot.params import Depends, EventMessage, EventPlainText, EventToMe, EventType +from nonebot.params import Depends, EventPlainText, EventToMe from nonebot.permission import SUPERUSER from nonebot.rule import to_me from nonebot.typing import T_State @@ -321,7 +320,7 @@ group_manage_matcher = on_command("群管理", rule=to_me(), permission=SUPERUSE @group_manage_matcher.handle() -async def send_group_list(bot: Bot, event: GroupMessageEvent, state: T_State): +async def send_group_list_private(bot: Bot, event: GroupMessageEvent, state: T_State): await group_manage_matcher.finish(Message("该功能只支持私聊使用，请私聊Bot")) From 01e1c149e0664006459584218dd9b87ef5a8b386 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Thu, 17 Mar 2022 01:35:22 +0800 Subject: [PATCH 11/18] fix #30 --- src/plugins/nonebot_bison/config_manager.py | 37 ++------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index 7e7255e..03ffa51 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -360,13 +360,13 @@ async def do_dispatch_command( "message", Rule(), permission, - None, - True, + handlers=None, + temp=True, priority=0, block=True, plugin=matcher.plugin, module=matcher.module, - expire_time=datetime.now() + bot.config.session_expire_timeout, + expire_time=datetime.now(), default_state=matcher.state, default_type_updater=matcher.__class__._default_type_updater, default_permission_updater=matcher.__class__._default_permission_updater, @@ -379,34 +379,3 @@ async def do_dispatch_command( do_del_sub(new_matcher) new_matcher_ins = new_matcher() asyncio.create_task(new_matcher_ins.run(bot, event, state)) - - -test_matcher = on_command("testtt") - - -@test_matcher.handle() -async def _handler(bot: Bot, event: Event, matcher: Matcher, state: T_State): - permission = await matcher.update_permission(bot, event) - new_matcher = Matcher.new( - "message", - Rule(), - permission, - None, - True, - priority=0, - block=True, - plugin=matcher.plugin, - module=matcher.module, - expire_time=datetime.now() + bot.config.session_expire_timeout, - default_state=matcher.state, - default_type_updater=matcher.__class__._default_type_updater, - default_permission_updater=matcher.__class__._default_permission_updater, - ) - - async def h(): - logger.warning("yes") - await new_matcher.send("666") - - new_matcher.handle()(h) - new_matcher_ins = new_matcher() - await new_matcher_ins.run(bot, event, state) From a471a1c39bd798c1a3511ac99cc2b891717ce3c3 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Thu, 17 Mar 2022 10:44:52 +0800 Subject: [PATCH 12/18] remove test_matcher --- tests/test_config_manager.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/test_config_manager.py b/tests/test_config_manager.py index 771170a..160563d 100644 --- a/tests/test_config_manager.py +++ b/tests/test_config_manager.py @@ -453,17 +453,3 @@ async def test_del_sub(app: App): ctx.should_finished() subs = config.list_subscribe(10000, "group") assert len(subs) == 0 - - -async def test_test(app: App): - from nonebot.adapters.onebot.v11.bot import Bot - from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import test_matcher - - async with app.test_matcher(test_matcher) as ctx: - bot = ctx.create_bot(base=Bot) - event = fake_group_message_event(message=Message("testtt")) - ctx.receive_event(bot, event) - ctx.should_pass_permission() - ctx.should_pass_rule() - ctx.should_call_send(event, "666", True) From 4f4767a773df7d4b2a27225dd04029684973ea19 Mon Sep 17 00:00:00 2001 From: Azide Date: Thu, 17 Mar 2022 00:23:51 +0800 Subject: [PATCH 13/18] update changelog.md --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 953fae6..8f68581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,5 +66,8 @@ ## [0.5.1] -- 使用了新的私聊进行群管理的方式 +- 使用了新的在私聊中进行群管理的方式：从`管理-*`替换为`群管理`命令 - 默认关闭自动重发功能 +- 添加了 [推送消息合并转发功能](https://nonebot-bison.vercel.app/usage/#%E9%85%8D%E7%BD%AE) +- 添加了`添加订阅`命令事件的中途取消功能 +- 优化了`添加订阅`命令的聊天处理逻辑 From d10dcdaa0c5c55c8936cca18f4665800cbaea68a Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Thu, 17 Mar 2022 11:47:48 +0800 Subject: [PATCH 14/18] remove test --- tests/test_config_manager_query_del.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/test_config_manager_query_del.py b/tests/test_config_manager_query_del.py index 0ae3f2d..51dd80d 100644 --- a/tests/test_config_manager_query_del.py +++ b/tests/test_config_manager_query_del.py @@ -85,17 +85,3 @@ async def test_del_sub(app: App): ctx.should_finished() subs = config.list_subscribe(10000, "group") assert len(subs) == 0 - - -async def test_test(app: App): - from nonebot.adapters.onebot.v11.bot import Bot - from nonebot.adapters.onebot.v11.message import Message - from nonebot_bison.config_manager import test_matcher - - async with app.test_matcher(test_matcher) as ctx: - bot = ctx.create_bot(base=Bot) - event = fake_group_message_event(message=Message("testtt")) - ctx.receive_event(bot, event) - ctx.should_pass_permission() - ctx.should_pass_rule() - ctx.should_call_send(event, "666", True) From f0853ccac8f35a7dd50e666be361fe0f3df671b6 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sat, 19 Mar 2022 13:39:16 +0800 Subject: [PATCH 15/18] add debug code --- src/plugins/nonebot_bison/post.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/nonebot_bison/post.py b/src/plugins/nonebot_bison/post.py index c668607..d7c1cad 100644 --- a/src/plugins/nonebot_bison/post.py +++ b/src/plugins/nonebot_bison/post.py @@ -139,6 +139,7 @@ class Post: msgs = [reduce(lambda x, y: x.append(y), msgs, Message())] msgs.extend(self.extra_msg) self._message = msgs + assert len(self._message) > 0, f"message list empty, {self}" return self._message def __str__(self): From 3d9523f5f375d6c4cb57c78f5b39e40573c4e743 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sat, 19 Mar 2022 20:09:14 +0800 Subject: [PATCH 16/18] update circleci config --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 750c461..c1364f5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,10 +14,10 @@ workflows: pre-steps: - run: command: | - if [ -z "${CIRCLE_PULL_REQUEST##*/}" ] + if [[ -n "${CIRCLE_PULL_REQUEST##*/}" && ${CIRCLE_BRANCH} =~ "pull/" ]] then - IS_PR=false - else IS_PR=true + else + IS_PR=false fi echo '{ "is_pr": '$IS_PR' }' >> /home/circleci/params.json From 9c3dc7059ed1d239dcdc39a14faa402e2dcd6487 Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sun, 20 Mar 2022 11:13:44 +0800 Subject: [PATCH 17/18] add target parser && add parser for bilibili --- src/plugins/nonebot_bison/config_manager.py | 12 +- .../nonebot_bison/platform/bilibili.py | 12 +- .../nonebot_bison/platform/platform.py | 7 ++ .../static/bilibili_arknights_profile.json | 1 + tests/test_config_manager_add.py | 109 ++++++++++++++++++ tests/utils.py | 1 + 6 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 tests/platforms/static/bilibili_arknights_profile.json diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py index 931bf3e..b939b88 100644 --- a/src/plugins/nonebot_bison/config_manager.py +++ b/src/plugins/nonebot_bison/config_manager.py @@ -15,6 +15,7 @@ from nonebot.params import Depends, EventPlainText, EventToMe from nonebot.permission import SUPERUSER from nonebot.rule import to_me from nonebot.typing import T_State +from nonebot_bison.platform.platform import Platform from .config import Config from .platform import check_sub_target, platform_manager @@ -108,8 +109,11 @@ def do_add_sub(add_sub: Type[Matcher]): "platform", _gen_prompt_template("{_prompt}"), [Depends(parse_platform)] ) async def init_id(state: T_State): - if platform_manager[state["platform"]].has_target: - state["_prompt"] = "请输入订阅用户的id:\n查询id获取方法请回复:“查询”" + cur_platform = platform_manager[state["platform"]] + if cur_platform.has_target: + state["_prompt"] = ( + cur_platform.parse_target_promot or "请输入订阅用户的id:\n查询id获取方法请回复:“查询”" + ) else: state["id"] = "default" state["name"] = await platform_manager[state["platform"]].get_target_name( @@ -125,6 +129,8 @@ def do_add_sub(add_sub: Type[Matcher]): raise LookupError if target == "取消": raise KeyboardInterrupt + platform = platform_manager[state["platform"]] + target = await platform.parse_target(target) name = await check_sub_target(state["platform"], target) if not name: raise ValueError @@ -141,6 +147,8 @@ def do_add_sub(add_sub: Type[Matcher]): await add_sub.finish("已中止订阅") except (ValueError): await add_sub.reject("id输入错误") + except (Platform.ParseTargetException): + await add_sub.reject("不能从你的输入中提取出id，请检查你输入的内容是否符合预期") else: await add_sub.send( "即将订阅的用户为:{} {} {}\n如有错误请输入“取消”重新订阅".format( diff --git a/src/plugins/nonebot_bison/platform/bilibili.py b/src/plugins/nonebot_bison/platform/bilibili.py index 5ff3cc1..94327ec 100644 --- a/src/plugins/nonebot_bison/platform/bilibili.py +++ b/src/plugins/nonebot_bison/platform/bilibili.py @@ -1,11 +1,12 @@ import json +import re from typing import Any, Optional import httpx from ..post import Post from ..types import Category, RawPost, Tag, Target -from .platform import CategoryNotSupport, NewMessage +from .platform import CategoryNotSupport, NewMessage, Platform class Bilibili(NewMessage): @@ -26,6 +27,7 @@ class Bilibili(NewMessage): schedule_kw = {"seconds": 10} name = "B站" has_target = True + parse_target_promot = "请输入用户主页的链接" async def get_target_name(self, target: Target) -> Optional[str]: async with httpx.AsyncClient() as client: @@ -37,6 +39,14 @@ class Bilibili(NewMessage): return None return res_data["data"]["name"] + async def parse_target(self, target_text: str) -> Target: + if re.match(r"\d+", target_text): + return Target(target_text) + elif match := re.match(r"(?:https://)?space.bilibili.com/(\d+)", target_text): + return Target(match.group(1)) + else: + raise Platform.ParseTargetException() + async def get_sub_list(self, target: Target) -> list[RawPost]: async with httpx.AsyncClient() as client: params = {"host_uid": target, "offset": 0, "need_top": 0} diff --git a/src/plugins/nonebot_bison/platform/platform.py b/src/plugins/nonebot_bison/platform/platform.py index e1c3471..19f002d 100644 --- a/src/plugins/nonebot_bison/platform/platform.py +++ b/src/plugins/nonebot_bison/platform/platform.py @@ -47,6 +47,7 @@ class Platform(metaclass=RegistryABCMeta, base=True): enable_tag: bool store: dict[Target, Any] platform_name: str + parse_target_promot: Optional[str] = None @abstractmethod async def get_target_name(self, target: Target) -> Optional[str]: @@ -73,6 +74,12 @@ class Platform(metaclass=RegistryABCMeta, base=True): self.reverse_category[val] = key self.store = dict() + class ParseTargetException(Exception): + pass + + async def parse_target(self, target_string: str) -> Target: + return Target(target_string) + @abstractmethod def get_tags(self, raw_post: RawPost) -> Optional[Collection[Tag]]: "Return Tag list of given RawPost" diff --git a/tests/platforms/static/bilibili_arknights_profile.json b/tests/platforms/static/bilibili_arknights_profile.json new file mode 100644 index 0000000..6e46b23 --- /dev/null +++ b/tests/platforms/static/bilibili_arknights_profile.json @@ -0,0 +1 @@ +{"code":0,"message":"0","ttl":1,"data":{"mid":161775300,"name":"明日方舟","sex":"保密","face":"http://i0.hdslb.com/bfs/face/89154378c06a5ed332c40c2ca56f50cd641c0c90.jpg","face_nft":0,"sign":"重铸未来 方舟启航","rank":10000,"level":6,"jointime":0,"moral":0,"silence":0,"coins":0,"fans_badge":true,"fans_medal":{"show":false,"wear":false,"medal":null},"official":{"role":3,"title":"明日方舟官方账号","desc":"","type":1},"vip":{"type":2,"status":1,"due_date":1648828800000,"vip_pay_type":0,"theme_type":0,"label":{"path":"","text":"年度大会员","label_theme":"annual_vip","text_color":"#FFFFFF","bg_style":1,"bg_color":"#FB7299","border_color":""},"avatar_subscript":1,"nickname_color":"#FB7299","role":3,"avatar_subscript_url":"http://i0.hdslb.com/bfs/vip/icon_Certification_big_member_22_3x.png"},"pendant":{"pid":5305,"name":"明日方舟音律系列","image":"http://i0.hdslb.com/bfs/garb/item/615a1653281141ddf64cbb98c792ddaee78f7f40.png","expire":0,"image_enhance":"http://i0.hdslb.com/bfs/garb/item/516ecdf2d495a62f1bac31497c831b711823140c.webp","image_enhance_frame":"http://i0.hdslb.com/bfs/garb/item/c0751afbf950373c260254d02768eabf30ff3906.png"},"nameplate":{"nid":0,"name":"","image":"","image_small":"","level":"","condition":""},"user_honour_info":{"mid":0,"colour":null,"tags":[]},"is_followed":true,"top_photo":"http://i1.hdslb.com/bfs/space/6c6084808ec5bdff1985acc05ce0e126c49ad76e.png","theme":{},"sys_notice":{},"live_room":{"roomStatus":1,"liveStatus":0,"url":"https://live.bilibili.com/5555734?broadcast_type=0\u0026is_room_feed=1","title":"《明日方舟》2022新春前瞻特辑","cover":"http://i0.hdslb.com/bfs/live/new_room_cover/79af83a27f6001c1acfb47d1c0b879290f7c3308.jpg","roomid":5555734,"roundStatus":1,"broadcast_type":0,"watched_show":{"switch":true,"num":13033,"text_small":"1.3万","text_large":"1.3万人看过","icon":"https://i0.hdslb.com/bfs/live/a725a9e61242ef44d764ac911691a7ce07f36c1d.png","icon_location":"","icon_web":"https://i0.hdslb.com/bfs/live/8d9d0f33ef8bf6f308742752d13dd0df731df19c.png"}},"birthday":"","school":null,"profession":{"name":"","department":"","title":"","is_show":0},"tags":null,"series":{"user_upgrade_status":3,"show_upgrade_window":false},"is_senior_member":0}} diff --git a/tests/test_config_manager_add.py b/tests/test_config_manager_add.py index a38a1a8..1f7552b 100644 --- a/tests/test_config_manager_add.py +++ b/tests/test_config_manager_add.py @@ -405,3 +405,112 @@ async def test_add_with_get_id(app: App): ctx.should_finished() subs = config.list_subscribe(10000, "group") assert len(subs) == 0 + + +@pytest.mark.asyncio +@respx.mock +async def test_add_with_target_parser(app: App): + from nonebot.adapters.onebot.v11.event import Sender + from nonebot.adapters.onebot.v11.message import Message + from nonebot_bison.config import Config + from nonebot_bison.config_manager import add_sub_matcher, common_platform + from nonebot_bison.platform import platform_manager + from nonebot_bison.platform.bilibili import Bilibili + + config = Config() + config.user_target.truncate() + + ak_list_router = respx.get( + "https://api.bilibili.com/x/space/acc/info?mid=161775300" + ) + ak_list_router.mock( + return_value=Response(200, json=get_json("bilibili_arknights_profile.json")) + ) + + async with app.test_matcher(add_sub_matcher) as ctx: + bot = ctx.create_bot() + event_1 = fake_group_message_event( + message=Message("添加订阅"), + sender=Sender(card="", nickname="test", role="admin"), + to_me=True, + ) + ctx.receive_event(bot, event_1) + ctx.should_pass_rule() + ctx.should_call_send( + event_1, + Message( + BotReply.add_reply_on_platform( + platform_manager=platform_manager, common_platform=common_platform + ) + ), + True, + ) + event_2 = fake_group_message_event( + message=Message("全部"), sender=Sender(card="", nickname="test", role="admin") + ) + ctx.receive_event(bot, event_2) + ctx.should_rejected() + ctx.should_call_send( + event_2, + BotReply.add_reply_on_platform_input_allplatform(platform_manager), + True, + ) + event_3 = fake_group_message_event( + message=Message("bilibili"), sender=fake_admin_user + ) + ctx.receive_event(bot, event_3) + assert Bilibili.parse_target_promot + ctx.should_call_send( + event_3, + Message(Bilibili.parse_target_promot), + True, + ) + event_4_err = fake_group_message_event( + message=Message( + "htps://space.bilbili.com/161775300?from=search&seid=13051774060625135297&spm_id_from=333.337.0.0" + ), + sender=fake_admin_user, + ) + ctx.receive_event(bot, event_4_err) + ctx.should_call_send( + event_4_err, BotReply.add_reply_on_target_parse_input_error, True + ) + ctx.should_rejected() + event_4_ok = fake_group_message_event( + message=Message( + "https://space.bilibili.com/161775300?from=search&seid=13051774060625135297&spm_id_from=333.337.0.0" + ), + sender=fake_admin_user, + ) + ctx.receive_event(bot, event_4_ok) + ctx.should_call_send( + event_4_ok, + BotReply.add_reply_on_target_confirm("bilibili", "明日方舟", "161775300"), + True, + ) + ctx.should_call_send( + event_4_ok, + Message(BotReply.add_reply_on_cats(platform_manager, "bilibili")), + True, + ) + event_5_ok = fake_group_message_event( + message=Message("视频"), sender=fake_admin_user + ) + ctx.receive_event(bot, event_5_ok) + ctx.should_call_send(event_5_ok, Message(BotReply.add_reply_on_tags), True) + event_6 = fake_group_message_event( + message=Message("全部标签"), sender=fake_admin_user + ) + ctx.receive_event(bot, event_6) + ctx.should_call_send( + event_6, BotReply.add_reply_subscribe_success("明日方舟"), True + ) + ctx.should_finished() + subs = config.list_subscribe(10000, "group") + assert len(subs) == 1 + sub = subs[0] + assert sub["target"] == "161775300" + assert sub["tags"] == [] + assert sub["cats"] == [platform_manager["bilibili"].reverse_category["视频"]] + assert sub["target_type"] == "bilibili" + assert sub["target_name"] == "明日方舟" diff --git a/tests/utils.py b/tests/utils.py index bd1930d..821544a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -131,6 +131,7 @@ class BotReply: return "添加 {} 成功".format(name) add_reply_on_id_input_error = "id输入错误" + add_reply_on_target_parse_input_error = "不能从你的输入中提取出id，请检查你输入的内容是否符合预期" add_reply_on_platform_input_error = "平台输入错误" add_reply_on_id = "请输入订阅用户的id:\n查询id获取方法请回复:“查询”" add_reply_on_tags = '请输入要订阅的tag，订阅所有tag输入"全部标签"' From ee153a58ee46d7e17fe63f4de37935b5093e073c Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Sun, 20 Mar 2022 11:20:23 +0800 Subject: [PATCH 18/18] update ci file --- .circleci/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/main.yml b/.circleci/main.yml index 0e5e293..0d9d5ab 100644 --- a/.circleci/main.yml +++ b/.circleci/main.yml @@ -90,13 +90,13 @@ workflows: filters: tags: ignore: /.*/ - tag: ${CIRCLE_BRANCH} + tag: ${CIRCLE_BRANCH//\//-} cache_from: '$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${CIRCLE_BRANCH}' - docker/publish: <<: *docker-push dockerfile: docker/Dockerfile_with_frontend_sentry name: "docker/publish-sentry" - tag: sentry,${CIRCLE_TAG}-sentry + tag: sentry,${CIRCLE_TAG//\//-}-sentry cache_from: '$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:sentry' - docker/publish: <<: *docker-push @@ -107,7 +107,7 @@ workflows: only: [main, dev] tags: ignore: /.*/ - tag: ${CIRCLE_BRANCH}-sentry + tag: ${CIRCLE_BRANCH//\//-}-sentry cache_from: '$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${CIRCLE_BRANCH}-sentry' jobs: