Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/qq_plugins/fortune.py

src/qq_plugins/fortune.py

@@ -3,16 +3,23 @@ from pathlib import Path
 from nonebot.rule import to_me
 from nonebot.plugin import on_command
 from nonebot.adapters.qq import Message, MessageEvent, MessageSegment
+
 from src.image.get_image import get_image_names
-from src.my_sqlite.models.fortune import QrFortune
-from src.my_sqlite.models.tarot import MajorArcana
+from src.my_sqlite.models.fortune import QrFortune,QrFortuneLog
 
 fortune_by_sqlite = on_command("今日运势", rule=to_me(), priority=10, block=True)
 @fortune_by_sqlite.handle()
 async def get_today_fortune(message: MessageEvent):
 
     local_image_path = get_image_names()
-    result = await QrFortune.get_fortune(message.get_user_id())
+    member_openid = message.get_user_id()
+    # 查询今日是否已经获取过今日运势，如果获取过则直接从日志取
+    result = await QrFortuneLog.is_get_fortune_log(member_openid)
+    if result is None:
+        # 获取 运势说明
+        result = await QrFortune.get_fortune()
+        # 把抽取的今日运势插入日志
+        await QrFortuneLog.insert_fortune_log(result, member_openid)
 
     content = ("\n" + "您的今日运势为：" + "\n" +
                result.fortune_summary + "\n" +

src/qq_plugins/good_bad_news.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from nonebot.rule import to_me
 from nonebot.plugin import on_command
-from nonebot.adapters.qq import Message, MessageEvent, MessageSegment
+from nonebot.adapters.qq import Message, MessageEvent, MessageSegment, exception
 import urllib.parse, requests
 import httpx
 
@@ -33,5 +33,8 @@ async def good_news_img(message: MessageEvent):
     # except BaseException:
     #     await good_news.finish("出错啦，请重试。")
 
-    await good_news.finish(MessageSegment.image(img_url))
+    try:
+        await good_news.finish(MessageSegment.image(img_url))
+    except exception.ActionFailed:
+        await good_news.finish("图片发送失败，请重试。这绝对不是咱的错，绝对不是！")