图片缓存不存在时不报错

Todysheep · Dec 10, 2024 · 576e6f8 · 576e6f8
1 parent 071b3fa
commit 576e6f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/nonebot_plugin_bottle/__init__.py b/nonebot_plugin_bottle/__init__.py
@@ -299,7 +299,7 @@ async def _(
             + f"你将编号No.{add_index}的漂流瓶以时速{random.randint(0,2**16)}km/h的速度扔出去，谁会捡到这个瓶子呢..."
             + ("（待审批）" if enable_approve else "" )
         )
-        if approve_notice_admin:
+        if enable_approve and approve_notice_admin:
             for user in bot.config.superusers:
                 await bot.send_private_msg(user_id=user, message=f"漂流瓶 {add_index} 等待审批，请前往web审批。")
     else:

diff --git a/nonebot_plugin_bottle/data_source.py b/nonebot_plugin_bottle/data_source.py
@@ -81,7 +81,11 @@ async def deserialize_message(message: List[Dict[str, Any]]) -> Message:
     for seg in message:
         if seg["type"] == "cached_image":
             seg["type"] = "image"
-            seg["data"]["file"] = await file_to_b64(cache_dir / seg["data"]["file"])
+            try:
+                seg["data"]["file"] = await file_to_b64(cache_dir / seg["data"]["file"])
+            except FileNotFoundError:
+                seg["type"] = "text"
+                seg["data"] = {"text": "[图片]"}
     return parse_obj_as(Message, message)