From e37f1c6165935d33ea978aaf87367aa2d28478c7 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Fri, 30 Aug 2024 02:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BF=AE=E6=94=B9=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/platform/qq/group_handle.py | 4 ++-- zhenxun/builtin_plugins/scheduler/morning.py | 2 +- zhenxun/builtin_plugins/superuser/broadcast/_data_source.py | 2 +- zhenxun/utils/common_utils.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zhenxun/builtin_plugins/platform/qq/group_handle.py b/zhenxun/builtin_plugins/platform/qq/group_handle.py index a2ec5cd8e..148500e61 100644 --- a/zhenxun/builtin_plugins/platform/qq/group_handle.py +++ b/zhenxun/builtin_plugins/platform/qq/group_handle.py @@ -242,7 +242,7 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent img_file = path / f"{i}.png" if img_file.exists(): msg_list.append(img_file) - if not await CommonUtils.is_block("group_welcome", group_id): + if not await CommonUtils.task_is_block("group_welcome", group_id): logger.info("发送群欢迎消息...", "入群检测", group_id=group_id) if msg_list: await MessageUtils.build_message(msg_list).send() @@ -314,5 +314,5 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent | GroupMemberDecreaseEvent ) operator_name = operator["card"] or operator["nickname"] result = f"{user_name} 被 {operator_name} 送走了." - if not await CommonUtils.is_block("refund_group_remind", str(event.group_id)): + if not await CommonUtils.task_is_block("refund_group_remind", str(event.group_id)): await group_decrease_handle.send(f"{result}") diff --git a/zhenxun/builtin_plugins/scheduler/morning.py b/zhenxun/builtin_plugins/scheduler/morning.py index 76138b296..d858d6279 100644 --- a/zhenxun/builtin_plugins/scheduler/morning.py +++ b/zhenxun/builtin_plugins/scheduler/morning.py @@ -38,7 +38,7 @@ async def _(): async def check(group_id: str) -> bool: - return not await CommonUtils.is_block("morning_goodnight", group_id) + return not await CommonUtils.task_is_block("morning_goodnight", group_id) # 早上好 diff --git a/zhenxun/builtin_plugins/superuser/broadcast/_data_source.py b/zhenxun/builtin_plugins/superuser/broadcast/_data_source.py index 1307883cd..c55077a30 100644 --- a/zhenxun/builtin_plugins/superuser/broadcast/_data_source.py +++ b/zhenxun/builtin_plugins/superuser/broadcast/_data_source.py @@ -42,7 +42,7 @@ async def send( error_count = 0 for group in group_list: try: - if not await CommonUtils.is_block( + if not await CommonUtils.task_is_block( group.group_id, "broadcast", # group.channel_id ): diff --git a/zhenxun/utils/common_utils.py b/zhenxun/utils/common_utils.py index 0c0d0821d..f3375c8f5 100644 --- a/zhenxun/utils/common_utils.py +++ b/zhenxun/utils/common_utils.py @@ -6,7 +6,7 @@ class CommonUtils: @classmethod - async def is_block(cls, module: str, group_id: str | None) -> bool: + async def task_is_block(cls, module: str, group_id: str | None) -> bool: """判断被动技能是否可以发送 参数: