ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-12-01 01:25:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 change USER perm and temp matcher type

Browse Source
This commit is contained in:
yanyongyu 2021-01-24 18:16:18 +08:00
parent eb330c3260
commit 853b797cd9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nonebot/matcher.py
View File

@ -526,7 +526,7 @@ class Matcher(metaclass=MatcherMeta):
except RejectedException: except RejectedException:
self.handlers.insert(0, handler) # type: ignore self.handlers.insert(0, handler) # type: ignore
Matcher.new( Matcher.new(
self.type, "message",
Rule(), Rule(),
USER(event.get_session_id(), USER(event.get_session_id(),
perm=self.permission), # type:ignore perm=self.permission), # type:ignore
@ -539,7 +539,7 @@ class Matcher(metaclass=MatcherMeta):
expire_time=datetime.now() + bot.config.session_expire_timeout) expire_time=datetime.now() + bot.config.session_expire_timeout)
except PausedException: except PausedException:
Matcher.new( Matcher.new(
self.type, "message",
Rule(), Rule(),
USER(event.get_session_id(), USER(event.get_session_id(),
perm=self.permission), # type:ignore perm=self.permission), # type:ignore

3
nonebot/permission.py
View File

@ -127,8 +127,7 @@ def USER(*user: str, perm: Permission = Permission()):
""" """
async def _user(bot: "Bot", event: "Event") -> bool: async def _user(bot: "Bot", event: "Event") -> bool:
return event.get_type() == "message" and event.get_session_id( return event.get_session_id() in user and await perm(bot, event)
) in user and await perm(bot, event)
return Permission(_user) return Permission(_user)