fix(command_manager): 修复插件卸载时元信息移除不精确的问题
修复 CommandManager 中 unload_plugin 方法移除插件元信息时使用 startswith 导致可能误删其他插件的问题,改为精确匹配 同时调整相关测试用例验证精确匹配行为
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
"""
|
||||
from ..config_loader import global_config
|
||||
from .admin_manager import AdminManager
|
||||
from .command_manager import CommandManager
|
||||
from .command_manager import matcher as command_manager
|
||||
from .permission_manager import PermissionManager
|
||||
from .plugin_manager import PluginManager
|
||||
from .redis_manager import RedisManager
|
||||
@@ -20,7 +20,6 @@ admin_manager = AdminManager()
|
||||
permission_manager = PermissionManager()
|
||||
|
||||
# 命令与事件管理器 (别名 matcher)
|
||||
command_manager = CommandManager(prefixes=tuple(global_config.bot.command))
|
||||
matcher = command_manager
|
||||
|
||||
# 插件管理器
|
||||
|
||||
@@ -93,7 +93,7 @@ class CommandManager:
|
||||
self.request_handler.unregister_by_plugin_name(plugin_name)
|
||||
|
||||
# 移除插件元信息
|
||||
plugins_to_remove = [name for name in self.plugins if name.startswith(plugin_name)]
|
||||
plugins_to_remove = [name for name in self.plugins if name == plugin_name]
|
||||
for name in plugins_to_remove:
|
||||
del self.plugins[name]
|
||||
|
||||
|
||||
@@ -170,13 +170,20 @@ class PermissionManager(Singleton):
|
||||
user_permission = await self.get_user_permission(user_id)
|
||||
return user_permission >= required_permission
|
||||
|
||||
def get_all_user_permissions(self) -> Dict[str, str]:
|
||||
async def get_all_user_permissions(self) -> Dict[str, str]:
|
||||
"""
|
||||
获取所有已配置的用户权限
|
||||
获取所有已配置的用户权限(包括 AdminManager 中的管理员)
|
||||
|
||||
:return: 一个包含所有用户权限的字典
|
||||
"""
|
||||
return self._data["users"].copy()
|
||||
permissions = self._data["users"].copy()
|
||||
|
||||
# 合并 AdminManager 中的管理员
|
||||
admins = await admin_manager.get_all_admins()
|
||||
for admin_id in admins:
|
||||
permissions[str(admin_id)] = Permission.ADMIN.value
|
||||
|
||||
return permissions
|
||||
|
||||
def get_all_users(self) -> Dict[str, str]:
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user