nonebot-plugin-rollpig 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

nonebot_plugin_rollpig/__init__.py

@@ -1,33 +1,13 @@
 import json, random, datetime, asyncio, requests
 from pathlib import Path
 
-from nonebot import on_command, require, on_startup
+from nonebot import on_command, require
 from nonebot.adapters.onebot.v11 import Event, MessageSegment
 from nonebot.log import logger
 from nonebot.plugin import PluginMetadata
 
 pig_images = []
 
-@on_startup
-async def load_pig_images():
-    global pig_images
-    try:
-        data = await asyncio.to_thread(sync_fetch_pig_data, "https://pighub.top/api/all-images")
-        
-        if data and data.get("images"):
-            pig_images = data["images"]
-            logger.success(f"成功从 PigHub 缓存 {len(pig_images)} 头猪猪")
-        else:
-            logger.warning("PigHub 中找不到猪猪")
-    except requests.exceptions.RequestException as e:
-        logger.error(f"从PigHub中获取猪猪失败: {e}")
-
-def sync_fetch_pig_data(url: str):
-    response = requests.get(url, timeout=30)
-    response.raise_for_status()
-
-    return response.json()
-
 # 确保依赖插件先被 NoneBot 注册
 require("nonebot_plugin_htmlrender")
 require("nonebot_plugin_localstore")
@@ -64,9 +44,6 @@ roll_pig = on_command("随机小猪", block=True)
 async def _(event: Event):
     global pig_images
     if not pig_images:
-        await roll_pig.finish("猪圈空荡荡，猪猪还没加载出来或者加载失败了...")
-        
-        # 再次尝试
         try:
             data = await asyncio.to_thread(sync_fetch_pig_data, "https://pighub.top/api/all-images")
             if data and data.get("images"):
@@ -78,13 +55,18 @@ async def _(event: Event):
             logger.error(f"从PigHub中获取猪猪失败: {e}")
         
         if not pig_images:
-            await roll_pig.finish("猪圈空荡荡，猪猪还是没加载出来...")
+            await roll_pig.finish("猪圈空荡荡...")
             return
 
     pig = random.choice(pig_images)
     image_url = "https://pighub.top/data/" + pig["thumbnail"].split("/")[-1]
     await roll_pig.finish(MessageSegment.image(image_url))
 
+def sync_fetch_pig_data(url: str):
+    response = requests.get(url, timeout=30)
+    response.raise_for_status()
+
+    return response.json()
 
 def load_json(path, default):
     if not path.exists():

{nonebot_plugin_rollpig-0.2.4.dist-info → nonebot_plugin_rollpig-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot_plugin_rollpig
-Version: 0.2.4
+Version: 0.2.5
 Summary: 今天是什么小猪
 License: MIT
 License-File: LICENSE

{nonebot_plugin_rollpig-0.2.4.dist-info → nonebot_plugin_rollpig-0.2.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nonebot_plugin_rollpig/__init__.py,sha256=BkTa4KmzREAFDwqm_VaEdQJIPxgzwe26lNcVFXmT7A0,5501
+nonebot_plugin_rollpig/__init__.py,sha256=A58M1sibFY4ygSfAjgSfxpboemxDo18c7WZQBFfUtjE,4781
 nonebot_plugin_rollpig/resource/image/android-pig.png,sha256=WwY2rtsABH8YbDDIoQDR6WdHW8qpStm_lF8eXZ4K-Tc,37845
 nonebot_plugin_rollpig/resource/image/apple-pig.png,sha256=HSh8SRguD65ZZLnbnTgtNiAqqNzZKuFijtKIC3TLZDU,41533
 nonebot_plugin_rollpig/resource/image/bacon.png,sha256=7G86_W17C14qCRDKCGuRES4yfidIrIMz2gxOat3Gnn8,55722
@@ -45,7 +45,7 @@ nonebot_plugin_rollpig/resource/image/zhuge-liang.png,sha256=yvF5hNUzBXJIHi-vwg5
 nonebot_plugin_rollpig/resource/image/zombie-pig.png,sha256=fKQlp_kI3x8wMlVUT6U-rilMLpH0TpT_-ViNVWBSbcM,20797
 nonebot_plugin_rollpig/resource/pig.json,sha256=0YHz5eLZOSwo-3Yh44UgXrZ4vTmpvSDMx9Ejh0htlxM,13236
 nonebot_plugin_rollpig/resource/template.html,sha256=vX7vbT3BmmsXhswiUIHqHNLds_CcUQIuZKdnz5bVthc,1060
-nonebot_plugin_rollpig-0.2.4.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
-nonebot_plugin_rollpig-0.2.4.dist-info/METADATA,sha256=Ewp0ze1G1_24hTqyDlWkcA-xYhgRH_i9_igiBFRlAng,2720
-nonebot_plugin_rollpig-0.2.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nonebot_plugin_rollpig-0.2.4.dist-info/RECORD,,
+nonebot_plugin_rollpig-0.2.5.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
+nonebot_plugin_rollpig-0.2.5.dist-info/METADATA,sha256=XNJd-tb4Lm8CEZj8h3-NOnLLw0ubvW4sXBRibCa8k6Q,2720
+nonebot_plugin_rollpig-0.2.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nonebot_plugin_rollpig-0.2.5.dist-info/RECORD,,