From ea613ce176816e8814135e32793424e46870f5a2 Mon Sep 17 00:00:00 2001 From: Flern Date: Fri, 3 Jan 2025 16:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20=E7=A7=BB=E9=99=A4=E7=A9=BAID?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=8F=8A=E8=B5=84=E6=BA=90=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/auto_update/__init__.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/zhenxun/builtin_plugins/auto_update/__init__.py b/zhenxun/builtin_plugins/auto_update/__init__.py index fc2656a7..e7e9cbe2 100644 --- a/zhenxun/builtin_plugins/auto_update/__init__.py +++ b/zhenxun/builtin_plugins/auto_update/__init__.py @@ -11,7 +11,7 @@ from nonebot_plugin_alconna import ( on_alconna, store_true, ) -from nonebot_plugin_session import EventSession +from nonebot_plugin_uninfo import Uninfo from zhenxun.configs.utils import PluginExtraData, RegisterConfig from zhenxun.services.log import logger @@ -68,26 +68,25 @@ _matcher = on_alconna( @_matcher.handle() async def _( bot: Bot, - session: EventSession, + session: Uninfo, ver_type: Match[str], resource: Query[bool] = Query("resource", False), ): result = "" - if not session.id1: - await MessageUtils.build_message("用户id为空...").finish() if not ver_type.available: result = await UpdateManage.check_version() logger.info("查看当前版本...", "检查更新", session=session) await MessageUtils.build_message(result).finish() try: - result = await UpdateManage.update(bot, session.id1, ver_type.result) + result = await UpdateManage.update(bot, session.user.id, ver_type.result) except Exception as e: logger.error("版本更新失败...", "检查更新", session=session, e=e) await MessageUtils.build_message(f"更新版本失败...e: {e}").finish() - try: - await ResourceManager.init_resources(True) - except DownloadResourceException: - result += "\n资源更新下载失败..." + if resource.result: + try: + await ResourceManager.init_resources(True) + except DownloadResourceException: + result += "\n资源更新下载失败..." if result: await MessageUtils.build_message(result).finish() await MessageUtils.build_message("更新版本失败...").finish()