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

Fix permission bug

Browse Source
This commit is contained in:
Richard Chien 2017-01-11 16:51:53 +08:00
parent 9108f37412
commit ca2ecbda94
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command.py
View File

@ -150,6 +150,7 @@ class CommandRegistry:
return True return True
return False return False
# noinspection PyTypeChecker
@staticmethod @staticmethod
def _check_permission(func, ctx_msg): def _check_permission(func, ctx_msg):
""" """
@ -170,11 +171,11 @@ class CommandRegistry:
if ctx_msg.get('type') == 'group_message' and ctx_msg.get('via') == 'qq': if ctx_msg.get('type') == 'group_message' and ctx_msg.get('via') == 'qq':
allowed_roles = {'owner', 'admin', 'member'} allowed_roles = {'owner', 'admin', 'member'}
if func.group_admin_only: if func.group_admin_only:
allowed_roles = allowed_roles.intersection({'owner', 'admin'}) allowed_roles.intersection_update({'owner', 'admin'})
if func.group_owner_only: if func.group_owner_only:
allowed_roles = allowed_roles.intersection({'owner'}) allowed_roles.intersection_update({'owner'})
groups = list(filter( groups = list(filter(
lambda g: g.get('group_uid') == ctx_msg.get('group_uid'), lambda g: str(g.get('id')) == ctx_msg.get('group_id'),
api.get_group_info(ctx_msg).json() api.get_group_info(ctx_msg).json()
)) ))
if len(groups) <= 0 or 'member' not in groups[0]: if len(groups) <= 0 or 'member' not in groups[0]:
@ -182,7 +183,7 @@ class CommandRegistry:
raise SkipException raise SkipException
members = list(filter( members = list(filter(
lambda m: str(m.get('uid')) == str(ctx_msg.get('sender_uid')), lambda m: str(m.get('id')) == ctx_msg.get('sender_id'),
groups[0].get('member') groups[0].get('member')
)) ))
if len(members) <= 0 or members[0].get('role') not in allowed_roles: if len(members) <= 0 or members[0].get('role') not in allowed_roles: