From 8470777f6cef6d4d0dce69da807250a6ade3051a Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Thu, 8 Aug 2024 18:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BF=AE=E6=94=B9b?= =?UTF-8?q?=E7=AB=99=E8=BD=AC=E5=8F=91=E8=A7=A3=E6=9E=90=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/hooks/chkdsk_hook.py | 5 +---- zhenxun/builtin_plugins/sign_in/utils.py | 5 ++--- zhenxun/plugins/parse_bilibili/__init__.py | 3 ++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py index df23e48e..a279d9d0 100644 --- a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py +++ b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py @@ -61,9 +61,6 @@ _blmt = BanCheckLimiter( malicious_ban_count, ) -# TODO: 恶意出发命令检测过滤 -_ignore = ["parse_bilibili"] - # 恶意触发命令检测 @run_preprocessor @@ -73,7 +70,7 @@ async def _(matcher: Matcher, bot: Bot, session: EventSession, state: T_State): module = plugin.module_name if metadata := plugin.metadata: extra = metadata.extra - if extra.get("plugin_type") == PluginType.HIDDEN or module not in _ignore: + if extra.get("plugin_type") == PluginType.HIDDEN: return user_id = session.id1 group_id = session.id3 or session.id2 diff --git a/zhenxun/builtin_plugins/sign_in/utils.py b/zhenxun/builtin_plugins/sign_in/utils.py index ecf7ad7f..cd9380a8 100644 --- a/zhenxun/builtin_plugins/sign_in/utils.py +++ b/zhenxun/builtin_plugins/sign_in/utils.py @@ -172,9 +172,8 @@ async def _generate_card( uid_img = await BuildImage.build_text_image( f"UID: {uid}", size=30, font_color=(255, 255, 255) ) - bk.getsize("Accumulative check-in for") - image1 = await bk.build_text_image("Accumulative check-in for", size=25) - image2 = await bk.build_text_image("days", size=25) + image1 = await bk.build_text_image("Accumulative check-in for", bk.font) + image2 = await bk.build_text_image("days", bk.font) sign_day_img = await BuildImage.build_text_image( f"{user.sign_count}", size=40, font_color=(211, 64, 33) ) diff --git a/zhenxun/plugins/parse_bilibili/__init__.py b/zhenxun/plugins/parse_bilibili/__init__.py index 3fcd136e..f42f78ae 100644 --- a/zhenxun/plugins/parse_bilibili/__init__.py +++ b/zhenxun/plugins/parse_bilibili/__init__.py @@ -12,6 +12,7 @@ from zhenxun.configs.path_config import TEMP_PATH from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task from zhenxun.models.task_info import TaskInfo from zhenxun.services.log import logger +from zhenxun.utils.enum import PluginType from zhenxun.utils.http_utils import AsyncHttpx from .information_container import InformationContainer @@ -27,7 +28,7 @@ __plugin_meta__ = PluginMetadata( extra=PluginExtraData( author="leekooyo", version="0.1", - menu_type="其他", + plugin_type=PluginType.HIDDEN, configs=[ RegisterConfig( module="_task",