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

Merge branch 'HibiKier:main' into main

Browse Source
This commit is contained in:
yajiwa 2022-06-19 17:26:13 +08:00 committed by GitHub
commit e5160a4ee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -243,9 +243,13 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
## 更新 ## 更新
### 2022/6/19
* 暂时使用hook修复webui中plugins2setting修改时会改变plugins2setting.cmd为字符串
* 修复原神树脂重复提醒的bug [@pull/828](https://github.com/HibiKier/zhenxun_bot/pull/828)
### 2022/6/18 ### 2022/6/18
* 修复webui中plugins2setting修改时会改变plugins2setting.cmd为字符串
* 修复昵称系统`BLACK_WORD`为空时造成报错 * 修复昵称系统`BLACK_WORD`为空时造成报错
* 修复特殊头像时背景透明化出错 * 修复特殊头像时背景透明化出错
* 修复text2image纯文本时换行时颜色不统一 * 修复text2image纯文本时换行时颜色不统一

12
plugins/genshin/query_user/resin_remind/init_task.py
View File

@ -149,12 +149,12 @@ async def _remind(user_id: int, uid: str):
if current_resin < max_resin: if current_resin < max_resin:
user_manager.remove(uid) user_manager.remove(uid)
user_manager.remove_overflow(uid) user_manager.remove_overflow(uid)
if current_resin <= max_resin - 40: if current_resin < max_resin - 40:
next_time = now + timedelta(minutes=(max_resin - 40 - current_resin + 1) * 8, seconds=10) next_time = now + timedelta(minutes=(max_resin - 40 - current_resin) * 8)
elif max_resin - 40 < current_resin <= max_resin - 20: elif max_resin - 40 <= current_resin < max_resin - 20:
next_time = now + timedelta(minutes=(max_resin - 20 - current_resin + 1) * 8, seconds=10) next_time = now + timedelta(minutes=(max_resin - 20 - current_resin) * 8)
elif max_resin - 20 < current_resin < max_resin: elif max_resin - 20 <= current_resin < max_resin:
next_time = now + timedelta(minutes=(max_resin - current_resin) * 8, seconds=10) next_time = now + timedelta(minutes=(max_resin - current_resin) * 8)
elif current_resin == max_resin: elif current_resin == max_resin:
custom_overflow_resin = Config.get_config("resin_remind", "CUSTOM_RESIN_OVERFLOW_REMIND") custom_overflow_resin = Config.get_config("resin_remind", "CUSTOM_RESIN_OVERFLOW_REMIND")
if user_manager.is_overflow(uid) and custom_overflow_resin: if user_manager.is_overflow(uid) and custom_overflow_resin:

38
plugins/web_ui/__init__.py
View File

@ -1,20 +1,30 @@
from configs.config import Config as gConfig from configs.config import Config as gConfig
from .api import * from .api import *
from .auth import * from .auth import *
from nonebot.matcher import Matcher
from nonebot.message import run_preprocessor, IgnoredException
gConfig.add_plugin_config( from utils.manager import plugins2settings_manager
"web-ui", from nonebot.typing import T_State
"username", from nonebot.adapters.onebot.v11 import (
"admin", Bot,
name="web-ui", MessageEvent
help_="前端管理用户名"
) )
gConfig.add_plugin_config(
"web-ui", gConfig.add_plugin_config("web-ui", "username", "admin", name="web-ui", help_="前端管理用户名")
"password",
None, gConfig.add_plugin_config("web-ui", "password", None, name="web-ui", help_="前端管理密码")
name="web-ui",
help_="前端管理密码"
# 使用webui访问api后plugins2settings中的cmd字段将从list变为str
# 暂时找不到原因
# 先使用hook修复
@run_preprocessor
async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
for module in plugins2settings_manager.keys():
if isinstance(plugins2settings_manager.get_plugin_data(module).get("cmd"), str):
plugins2settings_manager.set_module_data(
module,
"cmd",
plugins2settings_manager.get_plugin_data(module).get("cmd").split(","),
) )