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

修复查看插件仓库当已安装插件版本不一致时出错

Browse Source
This commit is contained in:
HibiKier 2022-12-17 13:41:37 +08:00
parent 9b477e2eb8
commit 0dc11b7edb
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -296,6 +296,10 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能
## 更新 ## 更新
### 2022/12/17
* 修复查看插件仓库当已安装插件版本不一致时出错
### 2022/12/15 ### 2022/12/15
* 修复自定义群欢迎消息无法使用 * 修复自定义群欢迎消息无法使用

5
basic_plugins/plugin_shop/data_source.py
View File

@ -116,7 +116,8 @@ async def show_plugin_repo() -> Union[int, str]:
if code != 200: if code != 200:
return code return code
plugin_info = json.load(open(plugin_json, "r", encoding="utf8")) plugin_info = json.load(open(plugin_json, "r", encoding="utf8"))
load_plugin_list = plugins_manager.get_data().keys() plugins_data = plugins_manager.get_data()
load_plugin_list = plugins_data.keys()
image_list = [] image_list = []
w, h = 0, 0 w, h = 0, 0
line_height = 10 line_height = 10
@ -134,7 +135,7 @@ async def show_plugin_repo() -> Union[int, str]:
version = "" version = ""
if key in load_plugin_list: if key in load_plugin_list:
status = "<f font_color=#1a7e30>[已安装]</f>" status = "<f font_color=#1a7e30>[已安装]</f>"
version = f"<f font_color=#1a7e30>[{plugins_manager.get_data()[key]['version']}]</f>" version = f"<f font_color=#1a7e30>[{plugins_data[key].version}]</f>"
s = ( s = (
f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}' f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}'
f' \t\t{status}\n' f' \t\t{status}\n'

23
plugins/web_ui/__init__.py
View File

@ -5,10 +5,7 @@ from nonebot.matcher import Matcher
from nonebot.message import run_preprocessor, IgnoredException from nonebot.message import run_preprocessor, IgnoredException
from utils.manager import plugins2settings_manager from utils.manager import plugins2settings_manager
from nonebot.typing import T_State from nonebot.typing import T_State
from nonebot.adapters.onebot.v11 import ( from nonebot.adapters.onebot.v11 import Bot, MessageEvent
Bot,
MessageEvent
)
gConfig.add_plugin_config("web-ui", "username", "admin", name="web-ui", help_="前端管理用户名") gConfig.add_plugin_config("web-ui", "username", "admin", name="web-ui", help_="前端管理用户名")
@ -23,14 +20,12 @@ gConfig.add_plugin_config("web-ui", "password", None, name="web-ui", help_="前
async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State): async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
flag = False flag = False
for module in plugins2settings_manager.keys(): for module in plugins2settings_manager.keys():
if isinstance(plugins2settings_manager.get_plugin_data(module).cmd, str): if plugins2settings_manager.get_plugin_data(module).cmd and isinstance(
plugins2settings_manager.set_module_data( plugins2settings_manager.get_plugin_data(module).cmd, str
module, ):
"cmd", plugins2settings_manager[module].cmd = plugins2settings_manager[
plugins2settings_manager.get_plugin_data(module).cmd.split(","), module
False ].cmd.split(",")
)
flag = True flag = True
if flag: if flag:
plugins2settings_manager.save() plugins2settings_manager.save()