ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-27 18:45:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✅ test matchergroup

Browse Source
This commit is contained in:
yanyongyu 2020-12-04 01:55:03 +08:00
parent 5b42454a55
commit f6806c1d55
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nonebot/__init__.py
View File

@ -215,7 +215,7 @@ def run(host: Optional[str] = None,
get_driver().run(host, port, *args, **kwargs)
from nonebot.plugin import on_message, on_notice, on_request, on_metaevent, CommandGroup
from nonebot.plugin import on_message, on_notice, on_request, on_metaevent, CommandGroup, MatcherGroup
from nonebot.plugin import on_startswith, on_endswith, on_keyword, on_command, on_regex
from nonebot.plugin import load_plugin, load_plugins, load_builtin_plugins
from nonebot.plugin import export, require, get_plugin, get_loaded_plugins

16
nonebot/plugin.py
View File

@ -555,8 +555,8 @@ class MatcherGroup:
"""
final_kwargs = self.base_kwargs.copy()
final_kwargs.update(kwargs)
final_kwargs["type"] = "meta_event"
matcher = Matcher.new(**final_kwargs)
final_kwargs.pop("type", None)
matcher = Matcher.new("meta_event", **final_kwargs)
self.matchers.append(matcher)
_tmp_matchers.get().add(matcher)
return matcher
@ -583,8 +583,8 @@ class MatcherGroup:
"""
final_kwargs = self.base_kwargs.copy()
final_kwargs.update(kwargs)
final_kwargs["type"] = "message"
matcher = Matcher.new(**final_kwargs)
final_kwargs.pop("type", None)
matcher = Matcher.new("message", **final_kwargs)
self.matchers.append(matcher)
_tmp_matchers.get().add(matcher)
return matcher
@ -610,8 +610,8 @@ class MatcherGroup:
"""
final_kwargs = self.base_kwargs.copy()
final_kwargs.update(kwargs)
final_kwargs["type"] = "notice"
matcher = Matcher.new(**final_kwargs)
final_kwargs.pop("type", None)
matcher = Matcher.new("notice", **final_kwargs)
self.matchers.append(matcher)
_tmp_matchers.get().add(matcher)
return matcher
@ -637,8 +637,8 @@ class MatcherGroup:
"""
final_kwargs = self.base_kwargs.copy()
final_kwargs.update(kwargs)
final_kwargs["type"] = "request"
matcher = Matcher.new(**final_kwargs)
final_kwargs.pop("type", None)
matcher = Matcher.new("request", **final_kwargs)
self.matchers.append(matcher)
_tmp_matchers.get().add(matcher)
return matcher

7
tests/test_plugins/test_group/__init__.py
View File

@ -1,6 +1,7 @@
from nonebot.rule import to_me
from nonebot import CommandGroup
from nonebot import CommandGroup, MatcherGroup
test = CommandGroup("test", rule=to_me())
cmd = CommandGroup("test", rule=to_me())
match = MatcherGroup(priority=2)
from . import commands
from . import commands, matches

4
tests/test_plugins/test_group/commands.py
View File

@ -1,9 +1,9 @@
from nonebot.typing import Bot, Event
from nonebot.permission import GROUP_OWNER
from . import test
from . import cmd
test_1 = test.command("1", aliases={"test"}, permission=GROUP_OWNER)
test_1 = cmd.command("1", aliases={"test"}, permission=GROUP_OWNER)
@test_1.handle()

15
tests/test_plugins/test_group/matches.py Normal file
View File

@ -0,0 +1,15 @@
from nonebot.typing import Bot, Event
from . import match
async def heartbeat(bot: Bot, event: Event, state: dict) -> bool:
return event.detail_type == "heartbeat"
test = match.on_metaevent(rule=heartbeat)
@test.receive()
async def handle_heartbeat(bot: Bot, event: Event, state: dict):
print("[i] Heartbeat")