diff --git a/.gitignore b/.gitignore index 752468c..aaa3440 100644 --- a/.gitignore +++ b/.gitignore @@ -147,4 +147,4 @@ build/ scratch_files/ /config.toml -/core/data/* \ No newline at end of file +/core/data/* diff --git a/core/managers/permission_manager.py b/core/managers/permission_manager.py index 0ae8740..b00d7f6 100644 --- a/core/managers/permission_manager.py +++ b/core/managers/permission_manager.py @@ -437,16 +437,3 @@ def require_admin(func): """ from functools import wraps from models.events.message import MessageEvent - from core.managers import permission_manager - - @wraps(func) - async def wrapper(event: MessageEvent, *args, **kwargs): - user_id = event.user_id - if await permission_manager.is_admin(user_id): - return await func(event, *args, **kwargs) - else: - # 假设 event 对象有 reply 方法 - if hasattr(event, "reply"): - await event.reply("抱歉,您没有权限执行此命令。") - return None - return wrapper diff --git a/core/managers/plugin_manager.py b/core/managers/plugin_manager.py index bd48213..7969dfa 100644 --- a/core/managers/plugin_manager.py +++ b/core/managers/plugin_manager.py @@ -17,6 +17,9 @@ from ..utils.singleton import Singleton # 确保logger在模块级别可见 __all__ = ['PluginManager', 'logger'] +# 确保logger在模块级别可见 +__all__ = ['PluginManager', 'logger'] + class PluginManager(Singleton): """ diff --git a/main.py b/main.py index 91826e2..0e81884 100644 --- a/main.py +++ b/main.py @@ -133,6 +133,9 @@ async def main(): # 同步帮助图片 await matcher.sync_help_pic() + # 同步帮助图片 + await matcher.sync_help_pic() + # 初始化权限管理器(包含了管理员管理功能) await permission_manager.initialize() diff --git a/models/events/message.py b/models/events/message.py index ac88c9f..e521d57 100644 --- a/models/events/message.py +++ b/models/events/message.py @@ -4,7 +4,7 @@ 定义了消息相关的事件类,包括 MessageEvent, PrivateMessageEvent, GroupMessageEvent。 """ from dataclasses import dataclass, field -from typing import List, Optional, Union +from typing import List, Optional, Union, ClassVar from core.permission import Permission from models.message import MessageSegment @@ -126,4 +126,4 @@ class GroupMessageEvent(MessageEvent): """ await self.bot.send_group_msg( group_id=self.group_id, message=message, auto_escape=auto_escape - ) \ No newline at end of file + ) diff --git a/plugins/auto_approve.py b/plugins/auto_approve.py index 874ca02..fa845a5 100644 --- a/plugins/auto_approve.py +++ b/plugins/auto_approve.py @@ -54,4 +54,4 @@ async def handle_group_request(bot: Bot, event: GroupRequestEvent): ) print(f"[自动同意] 已同意加入群聊 {event.group_id} (邀请人: {event.user_id})") except Exception as e: - print(f"[自动同意] 同意群聊邀请失败: {e}") \ No newline at end of file + print(f"[自动同意] 同意群聊邀请失败: {e}") diff --git a/tests/test_plugin_reload_meta.py b/tests/test_plugin_reload_meta.py index 8eb0f81..0f889c0 100644 --- a/tests/test_plugin_reload_meta.py +++ b/tests/test_plugin_reload_meta.py @@ -1,4 +1,3 @@ - from core.managers.command_manager import CommandManager class TestPluginReloadMeta: