From 7096d258db43e391a9c1b3fecce856275ba5629e Mon Sep 17 00:00:00 2001 From: hibiki <775757368@qq.com> Date: Tue, 17 Aug 2021 23:49:07 +0800 Subject: [PATCH] update code --- plugins/hook.py | 10 +++++----- plugins/send_img/__init__.py | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/hook.py b/plugins/hook.py index bede26c8..e7a5400b 100644 --- a/plugins/hook.py +++ b/plugins/hook.py @@ -230,12 +230,12 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State): pass raise IgnoredException("该插件在私聊中已被禁用...") # 维护 - if not group_manager.get_plugin_status( - module, block_type="all" - ) and not group_manager.check_group_is_white(event.group_id): + if not group_manager.get_plugin_status(module, block_type="all"): + if isinstance(event, GroupMessageEvent) and group_manager.check_group_is_white(event.group_id): + return try: - if _flmt_c.check(event.group_id): - _flmt_c.start_cd(event.group_id) + if _flmt_c.check(event.user_id): + _flmt_c.start_cd(event.user_id) if isinstance(event, GroupMessageEvent): await bot.send_group_msg( group_id=event.group_id, message="此功能正在维护..." diff --git a/plugins/send_img/__init__.py b/plugins/send_img/__init__.py index 56fc54eb..7f93f929 100644 --- a/plugins/send_img/__init__.py +++ b/plugins/send_img/__init__.py @@ -27,6 +27,9 @@ __plugin_usage__ = ( _flmt = FreqLimiter(1) +if '色图' in IMAGE_DIR_LIST: + IMAGE_DIR_LIST.remove('色图') + cmd = set(IMAGE_DIR_LIST) # print(cmd)