🚀 移除空ID检查及资源更新条件处理

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()