ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-16 02:50:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix arg message store

Browse Source
This commit is contained in:
yanyongyu
2021-12-23 22:16:55 +08:00
parent 76104d3237
commit 17f3c8fd09
6 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nonebot/matcher.py
View File

@ -28,6 +28,7 @@ from nonebot.rule import Rule
from nonebot.log import logger
from nonebot.dependencies import Dependent
from nonebot.permission import USER, Permission
from nonebot.consts import ARG_KEY, RECEIVE_KEY, REJECT_TARGET, LAST_RECEIVE_KEY
from nonebot.adapters import (
Bot,
Event,
@ -35,13 +36,6 @@ from nonebot.adapters import (
MessageSegment,
MessageTemplate,
)
from nonebot.consts import (
ARG_KEY,
ARG_STR_KEY,
RECEIVE_KEY,
REJECT_TARGET,
LAST_RECEIVE_KEY,
)
from nonebot.exception import (
PausedException,
StopPropagation,
@ -483,7 +477,7 @@ class Matcher(metaclass=MatcherMeta):
async def _key_getter(event: Event, matcher: "Matcher"):
if matcher.get_target() == ARG_KEY.format(key=key):
matcher.set_arg(key, event)
matcher.set_arg(key, event.get_message())
return
if matcher.get_arg(key):
return
@ -654,15 +648,11 @@ class Matcher(metaclass=MatcherMeta):
def get_last_receive(self, default: T = None) -> Union[Event, T]:
return self.state.get(LAST_RECEIVE_KEY, default)
def get_arg(self, key: str, default: T = None) -> Union[Event, T]:
def get_arg(self, key: str, default: T = None) -> Union[Message, T]:
return self.state.get(ARG_KEY.format(key=key), default)
def get_arg_str(self, key: str, default: T = None) -> Union[str, T]:
return self.state.get(ARG_STR_KEY.format(key=key), default)
def set_arg(self, key: str, event: Event) -> None:
self.state[ARG_KEY.format(key=key)] = event
self.state[ARG_STR_KEY.format(key=key)] = str(event.get_message())
def set_arg(self, key: str, message: Message) -> None:
self.state[ARG_KEY.format(key=key)] = message
def set_target(self, target: str) -> None:
self.state[REJECT_TARGET] = target