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 1/2] 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 2/2] 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)