This commit is contained in:
HibiKier 2023-02-27 19:44:47 +08:00
parent 8133b61ebd
commit 6826c10a09
3 changed files with 20 additions and 18 deletions

View File

@ -1,16 +1,18 @@
import copy import copy
from typing import List, Union, Dict, Callable, Any, Optional
from pathlib import Path from pathlib import Path
from .models import BaseData, BaseGroup from typing import Any, Callable, Dict, List, Optional, Union
from utils.manager.data_class import StaticData
from utils.utils import get_matchers, is_number
from configs.config import Config
import nonebot import nonebot
import ujson as json import ujson as json
from configs.config import Config
from utils.manager.data_class import StaticData
from utils.utils import get_matchers, is_number
from .models import BaseData, BaseGroup
Config.add_plugin_config( Config.add_plugin_config(
"group_manager", "DEFAULT_GROUP_LEVEL", 5, help_="默认群权限", default_value=5 "group_manager", "DEFAULT_GROUP_LEVEL", 5, help_="默认群权限", default_value=5, type=int
) )
Config.add_plugin_config( Config.add_plugin_config(
@ -19,6 +21,7 @@ Config.add_plugin_config(
True, True,
help_="默认进群总开关状态", help_="默认进群总开关状态",
default_value=True, default_value=True,
type=bool
) )

View File

@ -1,8 +1,11 @@
from pathlib import Path
from typing import List, Optional, Dict, Literal, Tuple, Union, Any
from pydantic import BaseModel
from configs.config import Config
from enum import Enum from enum import Enum
from pathlib import Path
from typing import Any, Dict, List, Literal, Optional, Tuple, Union
from pydantic import BaseModel
from configs.config import Config
from configs.utils import Config as zConfig
class AdminSetting(BaseModel): class AdminSetting(BaseModel):
@ -33,7 +36,7 @@ class BaseData(BaseModel):
""" """
white_group: List[int] = [] # 白名单 white_group: List[int] = [] # 白名单
close_task: List[str] = [] # 全局关闭的被动任务 close_task: List[str] = [] # 全局关闭的被动任务
group_manager: Dict[str, BaseGroup] = {} # 群组管理 group_manager: Dict[str, BaseGroup] = {} # 群组管理
task: Dict[str, str] = {} # 被动任务 【英文:中文】 task: Dict[str, str] = {} # 被动任务 【英文:中文】
@ -123,7 +126,7 @@ class PluginData(BaseModel):
plugin_block: Optional[PluginBlock] plugin_block: Optional[PluginBlock]
plugin_count: Optional[PluginCount] plugin_count: Optional[PluginCount]
plugin_resources: Optional[Dict[str, Union[str, Path]]] plugin_resources: Optional[Dict[str, Union[str, Path]]]
plugin_configs: Optional[Dict[str, Dict[str, Any]]] plugin_configs: Optional[Dict[str, zConfig]]
plugin_status: Plugin plugin_status: Plugin
class Config: class Config:

View File

@ -1,4 +1,4 @@
from typing import Dict, Any, Optional from typing import Any, Dict, Optional
from . import StaticData from . import StaticData
from .models import PluginData from .models import PluginData
@ -27,9 +27,5 @@ class PluginDataManager(StaticData[PluginData]):
def get(self, item: str, default: Any = None) -> PluginData: def get(self, item: str, default: Any = None) -> PluginData:
return self._data.get(item, default) return self._data.get(item, default)
def __getitem__(self, item) -> PluginData: def __getitem__(self, item) -> Optional[PluginData]:
return self._data.get(item) return self._data.get(item)