nonebot-plugin-rollpig 0.1.9__py3-none-any.whl → 0.2.1__py3-none-any.whl

nonebot_plugin_rollpig/__init__.py

@@ -1,22 +1,18 @@
+import json, random, datetime
+from pathlib import Path
+
 from nonebot import on_command, require
+from nonebot.adapters.onebot.v11 import Event, MessageSegment
+from nonebot.log import logger
 from nonebot.plugin import PluginMetadata
-from nonebot.adapters.onebot.v11 import MessageSegment
 
 # 确保依赖插件先被 NoneBot 注册
-require("nonebot_plugin_apscheduler")
 require("nonebot_plugin_htmlrender")
 require("nonebot_plugin_localstore")
 
-from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_htmlrender import template_to_pic
 import nonebot_plugin_localstore as store
 
-from nonebot.log import logger
-import random
-import json
-import datetime
-from pathlib import Path
-
 # 插件配置页
 __plugin_meta__ = PluginMetadata(
     name="今天是什么小猪",
@@ -38,7 +34,7 @@ RES_DIR = PLUGIN_DIR / "resource"
 # 今日记录
 TODAY_PATH = store.get_plugin_data_file("today.json")
 
-cmd = on_command("今天是什么小猪", aliases={"今日小猪", "我是什么小猪"})
+cmd = on_command("今天是什么小猪", aliases={"今日小猪"})
 
 
 def load_json(path, default):
@@ -47,7 +43,6 @@ def load_json(path, default):
         return default
     return json.loads(path.read_text("utf-8"))
 
-
 def save_json(path, data):
     path.write_text(
         json.dumps(data, ensure_ascii=False, indent=2),
@@ -56,7 +51,6 @@ def save_json(path, data):
 
 def find_image_file(pig_id: str) -> Path | None:
     exts = ["png", "jpg", "jpeg", "webp", "gif"]
-
     for ext in exts:
         file = IMAGE_DIR / f"{pig_id}.{ext}"
         if file.exists():
@@ -64,48 +58,46 @@ def find_image_file(pig_id: str) -> Path | None:
     return None
 
 
-# 0 点自动清空
-@scheduler.scheduled_job("cron", hour=0, minute=0)
-def reset_today():
-    if TODAY_PATH.exists():
-        TODAY_PATH.unlink()
-    logger.info("已清空今日记录")
+# 载入小猪信息
+PIG_LIST = load_json(PIGINFO_PATH, [])
+if not PIG_LIST:
+    logger.error("小猪信息为空或不存在，请检查资源文件！")
 
 # 主函数
 @cmd.handle()
-async def _(bot, event):
+async def _(event: Event):
     today_str = datetime.date.today().isoformat()
+    user_id = str(event.user_id)
 
     # 读取今日缓存
-    today_data = load_json(TODAY_PATH, {})
-
-    # 确保当天有字典存储用户数据
-    if today_str not in today_data:
-        today_data[today_str] = {}
-
-    user_id = str(event.user_id)  # 使用 QQ 号作为 key
-
-    # 不重复抽
-    if user_id in today_data[today_str]:
-        pig = today_data[today_str][user_id]
-        await send_rendered_pig(event, pig)
+    today_cache = load_json(TODAY_PATH, {"date": "", "records": {}})
+    
+    # 检查日期，如果不是今天，则清空记录
+    if today_cache.get("date") != today_str:
+        today_cache = {"date": today_str, "records": {}}
+
+    user_records = today_cache["records"]
+
+    # 如果用户今天已经抽过，直接发送结果
+    if user_id in user_records:
+        pig = user_records[user_id]
+        await send_rendered_pig(pig)
         return
 
-    piglist = load_json(PIGINFO_PATH, [])
-    if not piglist:
-        logger.error("pig.json 里没找到小猪信息哦~")
+    if not PIG_LIST:
+        await cmd.finish("小猪信息加载失败，请检查后台报错！")
         return
 
-    # 随机
-    pig = random.choice(piglist)
+    # 随机抽取
+    pig = random.choice(PIG_LIST)
 
     # 保存当天该用户的抽取结果
-    today_data[today_str][user_id] = pig
-    save_json(TODAY_PATH, today_data)
+    user_records[user_id] = pig
+    save_json(TODAY_PATH, today_cache)
 
-    await send_rendered_pig(event, pig)
+    await send_rendered_pig(pig)
 
-async def send_rendered_pig(event, pig_data):
+async def send_rendered_pig(pig_data: dict):
 
     # 使用 id 字段作为图片名
     pig_id = pig_data.get("id", "")
@@ -130,4 +122,4 @@ async def send_rendered_pig(event, pig_data):
         },
     )
 
-    await cmd.finish(MessageSegment.image(pic))
+    await cmd.finish(MessageSegment.image(pic))

{nonebot_plugin_rollpig-0.1.9.dist-info → nonebot_plugin_rollpig-0.2.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: nonebot_plugin_rollpig
-Version: 0.1.9
-Summary: 每日抽取属于自己的小猪
+Version: 0.2.1
+Summary: 今天是什么小猪
 License: MIT
 License-File: LICENSE
 Author: Bear_lele
@@ -15,11 +15,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: nonebot-adapter-onebot (>=2.2.0,<3.0.0)
+Requires-Dist: nonebot-adapter-onebot (>=2.4.0)
 Requires-Dist: nonebot-plugin-apscheduler (>=0.5.0)
-Requires-Dist: nonebot-plugin-htmlrender (>=0.4.0,<0.5.0)
+Requires-Dist: nonebot-plugin-htmlrender (>=0.6.7)
 Requires-Dist: nonebot-plugin-localstore (>=0.7.4)
-Requires-Dist: nonebot2 (>=2.4.0,<3.0.0)
+Requires-Dist: nonebot2 (>=2.4.0)
 Project-URL: Homepage, https://github.com/Bearlele/nonebot-plugin-rollpig
 Description-Content-Type: text/markdown
 

{nonebot_plugin_rollpig-0.1.9.dist-info → nonebot_plugin_rollpig-0.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-nonebot_plugin_rollpig/__init__.py,sha256=brN4rRpt41rC3Ow-A2lYEBhuJVl94IqrNFBmnutJhmM,3689
+nonebot_plugin_rollpig/__init__.py,sha256=paIp_Tqb-qBhe3tbvD5kEm2QIAHf3Frr6kDOY-ZexwI,3607
 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
@@ -41,7 +41,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=PqBF8X5TLqK1dOEtrKBd51hHJ4_h5XY3afGaUKRe3YI,11905
 nonebot_plugin_rollpig/resource/template.html,sha256=vX7vbT3BmmsXhswiUIHqHNLds_CcUQIuZKdnz5bVthc,1060
-nonebot_plugin_rollpig-0.1.9.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
-nonebot_plugin_rollpig-0.1.9.dist-info/METADATA,sha256=wRvv_JGKiDw_alHQeL_dYsu4ZU4os2XXbAHpQIlEkAQ,2691
-nonebot_plugin_rollpig-0.1.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nonebot_plugin_rollpig-0.1.9.dist-info/RECORD,,
+nonebot_plugin_rollpig-0.2.1.dist-info/licenses/LICENSE,sha256=zn7XqavdCw11Nln_m8Eu0S7C3rZ9C-VGbqbrVGeSTGg,1087
+nonebot_plugin_rollpig-0.2.1.dist-info/METADATA,sha256=X8THu5giwml8LXvGdIai2epotm-FP4fAtbhKB1WK7Ig,2658
+nonebot_plugin_rollpig-0.2.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nonebot_plugin_rollpig-0.2.1.dist-info/RECORD,,