From 853b797cd9f0c1ae95ab2fe76f0bcffd3f7a9481 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 24 Jan 2021 18:16:18 +0800 Subject: [PATCH] :bug: change USER perm and temp matcher type --- nonebot/matcher.py | 4 ++-- nonebot/permission.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index a3531932..b82164e0 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -526,7 +526,7 @@ class Matcher(metaclass=MatcherMeta): except RejectedException: self.handlers.insert(0, handler) # type: ignore Matcher.new( - self.type, + "message", Rule(), USER(event.get_session_id(), perm=self.permission), # type:ignore @@ -539,7 +539,7 @@ class Matcher(metaclass=MatcherMeta): expire_time=datetime.now() + bot.config.session_expire_timeout) except PausedException: Matcher.new( - self.type, + "message", Rule(), USER(event.get_session_id(), perm=self.permission), # type:ignore diff --git a/nonebot/permission.py b/nonebot/permission.py index 751dae8b..04337c67 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -127,8 +127,7 @@ def USER(*user: str, perm: Permission = Permission()): """ async def _user(bot: "Bot", event: "Event") -> bool: - return event.get_type() == "message" and event.get_session_id( - ) in user and await perm(bot, event) + return event.get_session_id() in user and await perm(bot, event) return Permission(_user)