v0.2.1 for beta.1+🥳

Author: KafCoppelia

README.md

@@ -16,37 +16,47 @@ _🍗 天天疯狂 🍗_
   </a>
 
   <a href="https://github.com/nonebot/nonebot2">
-    <img src="https://img.shields.io/badge/nonebot2-2.0.0beta.1-green">
+    <img src="https://img.shields.io/badge/nonebot2-2.0.0beta.1+-green">
   </a>
 
   <a href="">
-    <img src="https://img.shields.io/badge/release-v0.2.0-orange">
+    <img src="https://img.shields.io/badge/release-v0.2.1-orange">
   </a>
 
 </p>
 </p>
 
 ## 版本
 
-v0.2.0
+v0.2.1
 
-⚠ 适配nonebot2-2.0.0beta.1；适配alpha.16版本参见[alpha.16分支](https://github.com/KafCoppelia/nonebot_plugin_crazy_thursday/tree/alpha.16)
+⚠ 适配nonebot2-2.0.0beta.1+；
+
+👉 适配alpha.16版本参见[alpha.16分支](https://github.com/KafCoppelia/nonebot_plugin_crazy_thursday/tree/alpha.16)
+
+[更新日志](https://github.com/KafCoppelia/nonebot_plugin_crazy_thursday/releases/tag/v0.2.1)
 
 ## 安装
 
-1. 通过`pip`或`nb`安装，版本请指定`^0.2.0`；
+1. 通过`pip`或`nb`安装，版本请指定`0.2.1`；
 
-2. 读取文案的默认路径位于`./resource`下；
+2. 读取文案的默认路径位于`./resource`下；可在`.env.*`下设置：
+
+```python
+CRAZY_PATH="your-path-to-post.json"
+```
 
 ## 功能
 
 天天疯狂！随机输出KFC疯狂星期四文案。
 
+**新增** 三十余条文案！
+
 ## 命令
 
-1. 天天疯狂，疯狂星期[一|二|三|四|五|六|日]；
+1. 天天疯狂，疯狂星期[一|二|三|四|五|六|日]，输入**疯狂星期八**等不合法时间将提示；
 
-2. 输入**疯狂星期八**等不合法时间将提示；
+2. **新增**：支持狂乱[月|火|水|木|金|土|日]曜日日文触发；
 
 ## 本插件改自HoshinoBot疯狂星期四插件
 

nonebot_plugin_crazy_thursday/__init__.py

@@ -1,31 +1,72 @@
 import random
-import json
 import os
+from pathlib import Path
 import re
 import nonebot
-from nonebot.typing import T_State
-from nonebot.params import State
-from nonebot import on_regex
+from nonebot import on_command, on_regex
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, GROUP
+try:
+    import ujson as json
+except ModuleNotFoundError:
+    import json
 
-_CRAZY_PATH = nonebot.get_driver().config.crazy_path
-CRAZY_PATH = os.path.join(os.path.dirname(__file__), "resource") if not _CRAZY_PATH else _CRAZY_PATH
+global_config = nonebot.get_driver().config
+if not hasattr(global_config, "crazy_path"):
+    CRAZY_PATH = os.path.join(os.path.dirname(__file__), "resource")
+else:
+    CRAZY_PATH = global_config.crazy_path
 
-# V我50
+__crazy_vsrsion__ = "v0.2.1"
+plugin_notes = f'''
+KFC疯狂星期四 {__crazy_vsrsion__}
+[疯狂星期X] 随机输出KFC疯狂星期四文案
+[狂乱X曜日] 随机输出KFC疯狂星期四文案'''.strip()
+
+plugin_help = on_command("疯狂星期四帮助", permission=GROUP, priority=15, block=True)
 crazy = on_regex(r'疯狂星期.', permission=GROUP, priority=15, block=True)
+crazy_jp = on_regex(r'狂乱.曜日', permission=GROUP, priority=15, block=True)
+
+@plugin_help.handle()
+async def _(bot: Bot, event: GroupMessageEvent):
+    await plugin_help.finish(plugin_notes)
 
 @crazy.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State=State()):
-    iscrazy = re.search(r'(.*?)星期[一|二|三|四|五|六|日]', event.get_plaintext())
-    crazy_day = iscrazy.group(0)[-3:] if iscrazy is not None else None
+async def _(bot: Bot, event: GroupMessageEvent):
+    iscrazy = re.search(r'疯狂星期[一|二|三|四|五|六|日]', event.get_plaintext())
+    crazy_day = iscrazy.group(0)[-1] if iscrazy is not None else None
     if crazy_day is None:
         await crazy.finish("给个准确时间，OK?")
 
     # json数据存放路径
-    filePath = os.path.join(CRAZY_PATH, "post.json")
+    filePath = Path(CRAZY_PATH) / "post.json"
     # 将json对象加载到数组
-    kfc = json.load(open(filePath, 'r', encoding="UTF-8")).get('post')
+    with open(filePath, "r", encoding="utf-8") as f:
+        kfc = json.load(f).get("post")
     # 随机选取数组中的一个对象
-    randomPost = random.choice(kfc)
-    randomPost = randomPost.replace("星期四", crazy_day)
-    await bot.send(event=event, message=randomPost)
+    randomPost = random.choice(kfc).replace("星期四", "星期" + crazy_day).replace("周四", "周" + crazy_day)
+    await crazy.finish(randomPost)
+
+@crazy_jp.handle()
+async def _(bot: Bot, event: GroupMessageEvent):
+    iscrazy = re.search(r'狂乱[月|火|水|木|金|土|日]曜日', event.get_plaintext())
+    crazy_day = iscrazy.group(0)[-3] if iscrazy is not None else None
+    
+    if crazy_day is None:
+        await crazy_jp.finish("给个准确时间，OK?")
+
+    filePath = Path(CRAZY_PATH) / "post.json"
+    with open(filePath, "r", encoding="utf-8") as f:
+        kfc = json.load(f).get("post")
+    
+    randomPost = random.choice(kfc).replace("星期四", "星期" + weekday_table[crazy_day]).replace("周四", "周" + weekday_table[crazy_day])
+    await crazy_jp.finish(randomPost)
+
+weekday_table = {
+    "月": "一",
+    "火": "二",
+    "水": "三",
+    "木": "四",
+    "金": "五",
+    "土": "六",
+    "日": "日"
+}