From 99cf2b32b164af4e89eb10958ec8ea9a018dc126 Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Mon, 20 Mar 2023 20:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E6=97=B6=E4=BD=BF=E7=94=A8=E9=81=93=E5=85=B7=E5=90=8E?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/sign_group_user.py | 3 ++- utils/manager/plugins2settings_manager.py | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/models/sign_group_user.py b/models/sign_group_user.py index 63766334..e585d137 100755 --- a/models/sign_group_user.py +++ b/models/sign_group_user.py @@ -16,7 +16,7 @@ class SignGroupUser(Model): """群聊id""" checkin_count = fields.IntField(default=0) """签到次数""" - checkin_time_last = fields.DatetimeField(auto_now=True) + checkin_time_last = fields.DatetimeField(default=datetime.min) """最后签到时间""" impression = fields.DecimalField(10, 3, default=0) """好感度""" @@ -40,6 +40,7 @@ class SignGroupUser(Model): :param user: 用户 :param impression: 增加的好感度 """ + user.checkin_time_last = datetime.now() user.checkin_count = user.checkin_count + 1 user.add_probability = 0 user.specify_probability = 0 diff --git a/utils/manager/plugins2settings_manager.py b/utils/manager/plugins2settings_manager.py index 0148069b..b58c4644 100644 --- a/utils/manager/plugins2settings_manager.py +++ b/utils/manager/plugins2settings_manager.py @@ -1,7 +1,10 @@ -from typing import List, Optional, Union, Tuple, Dict, overload -from utils.manager.data_class import StaticData from pathlib import Path +from typing import Dict, List, Optional, Tuple, Union, overload + from ruamel import yaml + +from utils.manager.data_class import StaticData + from .models import PluginSetting, PluginType _yaml = yaml.YAML(typ="safe") @@ -24,7 +27,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]): def add_plugin_settings( self, plugin: str, - cmd: List[str] = None, + cmd: Optional[List[str]] = None, default_status: bool = True, level: int = 5, limit_superuser: bool = False, @@ -36,7 +39,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]): def add_plugin_settings( self, plugin: str, - cmd: Union[List[str], PluginSetting] = None, + cmd: Optional[Union[List[str], PluginSetting]] = None, default_status: bool = True, level: int = 5, limit_superuser: bool = False, @@ -76,6 +79,14 @@ class Plugins2settingsManager(StaticData[PluginSetting]): """ return self._data.get(module) + @overload + def get_plugin_module(self, cmd: str) -> str: + ... + + @overload + def get_plugin_module(self, cmd: str, is_all: bool = True) -> List[str]: + ... + def get_plugin_module( self, cmd: str, is_all: bool = False ) -> Union[str, List[str]]: @@ -102,7 +113,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]): """ self.__load_file() - def save(self, path: Union[str, Path] = None): + def save(self, path: Optional[Union[str, Path]] = None): """ 说明: 保存文件