Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复首次签到时使用道具后签到报错

Browse Source
This commit is contained in:
HibiKier 2023-03-20 20:54:53 +08:00
parent 6a3b66b266
commit 99cf2b32b1
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
models/sign_group_user.py
View File

@ -16,7 +16,7 @@ class SignGroupUser(Model):
"""群聊id""" """群聊id"""
checkin_count = fields.IntField(default=0) 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) impression = fields.DecimalField(10, 3, default=0)
"""好感度""" """好感度"""
@ -40,6 +40,7 @@ class SignGroupUser(Model):
:param user: 用户 :param user: 用户
:param impression: 增加的好感度 :param impression: 增加的好感度
""" """
user.checkin_time_last = datetime.now()
user.checkin_count = user.checkin_count + 1 user.checkin_count = user.checkin_count + 1
user.add_probability = 0 user.add_probability = 0
user.specify_probability = 0 user.specify_probability = 0

21
utils/manager/plugins2settings_manager.py
View File

@ -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 pathlib import Path
from typing import Dict, List, Optional, Tuple, Union, overload
from ruamel import yaml from ruamel import yaml
from utils.manager.data_class import StaticData
from .models import PluginSetting, PluginType from .models import PluginSetting, PluginType
_yaml = yaml.YAML(typ="safe") _yaml = yaml.YAML(typ="safe")
@ -24,7 +27,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]):
def add_plugin_settings( def add_plugin_settings(
self, self,
plugin: str, plugin: str,
cmd: List[str] = None, cmd: Optional[List[str]] = None,
default_status: bool = True, default_status: bool = True,
level: int = 5, level: int = 5,
limit_superuser: bool = False, limit_superuser: bool = False,
@ -36,7 +39,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]):
def add_plugin_settings( def add_plugin_settings(
self, self,
plugin: str, plugin: str,
cmd: Union[List[str], PluginSetting] = None, cmd: Optional[Union[List[str], PluginSetting]] = None,
default_status: bool = True, default_status: bool = True,
level: int = 5, level: int = 5,
limit_superuser: bool = False, limit_superuser: bool = False,
@ -76,6 +79,14 @@ class Plugins2settingsManager(StaticData[PluginSetting]):
""" """
return self._data.get(module) 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( def get_plugin_module(
self, cmd: str, is_all: bool = False self, cmd: str, is_all: bool = False
) -> Union[str, List[str]]: ) -> Union[str, List[str]]:
@ -102,7 +113,7 @@ class Plugins2settingsManager(StaticData[PluginSetting]):
""" """
self.__load_file() self.__load_file()
def save(self, path: Union[str, Path] = None): def save(self, path: Optional[Union[str, Path]] = None):
""" """
说明: 说明:
保存文件 保存文件