From 7dfcd0983abff3f260a5ac4ee97f7b63c9fc2a7e Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Thu, 15 Aug 2024 00:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/group_member_update/__init__.py | 2 +- .../admin/group_member_update/_data_source.py | 7 +++++++ zhenxun/builtin_plugins/hooks/chkdsk_hook.py | 2 ++ zhenxun/plugins/mute/_data_source.py | 6 +++--- zhenxun/plugins/web_ui/__init__.py | 13 +++++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/zhenxun/builtin_plugins/admin/group_member_update/__init__.py b/zhenxun/builtin_plugins/admin/group_member_update/__init__.py index 48508b21..437b3aa9 100644 --- a/zhenxun/builtin_plugins/admin/group_member_update/__init__.py +++ b/zhenxun/builtin_plugins/admin/group_member_update/__init__.py @@ -85,7 +85,7 @@ async def _(): logger.debug("自动更新群组成员信息成功...") except Exception as e: logger.error( - f"Bot: {bot.self_id} 自动更新群组成员信息成功", + f"Bot: {bot.self_id} 自动更新群组成员信息失败", target=group.group_id, e=e, ) diff --git a/zhenxun/builtin_plugins/admin/group_member_update/_data_source.py b/zhenxun/builtin_plugins/admin/group_member_update/_data_source.py index 9a790625..066dabe0 100644 --- a/zhenxun/builtin_plugins/admin/group_member_update/_data_source.py +++ b/zhenxun/builtin_plugins/admin/group_member_update/_data_source.py @@ -105,6 +105,13 @@ class MemberUpdateManage: ), "%Y-%m-%d %H:%M:%S", ) + cnt = await GroupInfoUser.filter( + user_id=str(user_id), group_id=group_id + ).count() + if cnt > 1: + await GroupInfoUser.filter( + user_id=str(user_id), group_id=group_id + ).delete() await GroupInfoUser.update_or_create( user_id=str(user_id), group_id=group_id, diff --git a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py index dd42e3ea..5c19636d 100644 --- a/zhenxun/builtin_plugins/hooks/chkdsk_hook.py +++ b/zhenxun/builtin_plugins/hooks/chkdsk_hook.py @@ -71,6 +71,8 @@ async def _(matcher: Matcher, bot: Bot, session: EventSession, state: T_State): extra = metadata.extra if extra.get("plugin_type") == PluginType.HIDDEN: return + else: + return user_id = session.id1 group_id = session.id3 or session.id2 malicious_ban_time = Config.get_config("hook", "MALICIOUS_BAN_TIME") diff --git a/zhenxun/plugins/mute/_data_source.py b/zhenxun/plugins/mute/_data_source.py index 206de400..92bd3dd5 100644 --- a/zhenxun/plugins/mute/_data_source.py +++ b/zhenxun/plugins/mute/_data_source.py @@ -47,9 +47,9 @@ class MuteManage: """ if group_id not in self._group_data: self._group_data[group_id] = GroupData( - count=base_config.get("MUTE_DEFAULT_COUNT"), - time=base_config.get("MUTE_DEFAULT_TIME"), - duration=base_config.get("MUTE_DEFAULT_DURATION"), + count=base_config.get("MUTE_DEFAULT_COUNT", 10), + time=base_config.get("MUTE_DEFAULT_TIME", 7), + duration=base_config.get("MUTE_DEFAULT_DURATION", 10), ) return self._group_data[group_id] diff --git a/zhenxun/plugins/web_ui/__init__.py b/zhenxun/plugins/web_ui/__init__.py index 8df59903..35fcf9fe 100644 --- a/zhenxun/plugins/web_ui/__init__.py +++ b/zhenxun/plugins/web_ui/__init__.py @@ -3,9 +3,12 @@ import asyncio import nonebot from fastapi import APIRouter, FastAPI from nonebot.log import default_filter, default_format +from nonebot.plugin import PluginMetadata from zhenxun.configs.config import Config as gConfig +from zhenxun.configs.utils import PluginExtraData from zhenxun.services.log import logger, logger_ +from zhenxun.utils.enum import PluginType from .api.logs import router as ws_log_routes from .api.logs.log_manager import LOG_STORAGE @@ -18,6 +21,16 @@ from .api.tabs.plugin_manage import router as plugin_router from .api.tabs.system import router as system_router from .auth import router as auth_router +__plugin_meta__ = PluginMetadata( + name="WebUi", + description="WebUi API", + usage=""" + """.strip(), + extra=PluginExtraData( + author="HibiKier", version="0.1", plugin_type=PluginType.HIDDEN + ).dict(), +) + driver = nonebot.get_driver() gConfig.add_plugin_config("web-ui", "username", "admin", help="前端管理用户名")