ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-06-07 12:55:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ improve user permission accessibility (#1825)

Browse Source
This commit is contained in:
Ju4tCode 2023-03-20 12:39:17 +08:00 committed by GitHub
parent c5444799f5
commit ba808c85d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nonebot/internal/permission.py
View File

@ -58,7 +58,7 @@ class Permission:
stack: Optional[AsyncExitStack] = None, stack: Optional[AsyncExitStack] = None,
dependency_cache: Optional[T_DependencyCache] = None, dependency_cache: Optional[T_DependencyCache] = None,
) -> bool: ) -> bool:
"""检查是否满足某个权限 """检查是否满足某个权限。
参数: 参数:
bot: Bot 对象 bot: Bot 对象
@ -110,7 +110,7 @@ class Permission:
class User: class User:
"""检查当前事件是否属于指定会话 """检查当前事件是否属于指定会话。
参数: 参数:
users: 会话 ID 元组 users: 会话 ID 元组
@ -141,29 +141,47 @@ class User:
session in self.users and (self.perm is None or await self.perm(bot, event)) session in self.users and (self.perm is None or await self.perm(bot, event))
) )
@classmethod
def _clean_permission(cls, perm: Permission) -> Optional[Permission]:
if len(perm.checkers) == 1 and isinstance(
user_perm := tuple(perm.checkers)[0].call, cls
):
return user_perm.perm
return perm
@classmethod @classmethod
def from_event(cls, event: Event, perm: Optional[Permission] = None) -> Self: def from_event(cls, event: Event, perm: Optional[Permission] = None) -> Self:
"""从事件中获取会话 ID """从事件中获取会话 ID。
如果 `perm` 中仅有 `User` 类型的权限检查函数，则会去除原有的会话 ID 限制。
参数: 参数:
event: Event 对象 event: Event 对象
perm: 需同时满足的权限 perm: 需同时满足的权限
""" """
if ( return cls((event.get_session_id(),), perm=perm and cls._clean_permission(perm))
perm
and len(perm.checkers) == 1 @classmethod
and isinstance(user_perm := tuple(perm.checkers)[0].call, cls) def from_permission(cls, *users: str, perm: Optional[Permission] = None) -> Self:
): """指定会话与权限。
perm = user_perm.perm
return cls((event.get_session_id(),), perm) 如果 `perm` 中仅有 `User` 类型的权限检查函数，则会去除原有的会话 ID 限制。
参数:
users: 会话白名单
perm: 需同时满足的权限
"""
return cls(users, perm=perm and cls._clean_permission(perm))
def USER(*users: str, perm: Optional[Permission] = None): def USER(*users: str, perm: Optional[Permission] = None):
"""匹配当前事件属于指定会话 """匹配当前事件属于指定会话。
如果 `perm` 中仅有 `User` 类型的权限检查函数，则会去除原有检查函数的会话 ID 限制。
参数: 参数:
user: 会话白名单 user: 会话白名单
perm: 需要同时满足的权限 perm: 需要同时满足的权限
""" """
return Permission(User(users, perm)) return Permission(User.from_permission(*users, perm=perm))