WIKI使用oss发送静态资源，节省空间

Paimon_Chat/__init__.py

@@ -42,3 +42,4 @@ def create_matcher(chat_word: str, pattern: str, cooldown: int, pro: float, resp
 for k, v in chat_list.items():
     create_matcher(k, v['pattern'], v['cooldown'], v['pro'], v['files'])
 
+

Paimon_Info/draw_daily_note.py

@@ -299,7 +299,7 @@ async def draw_daily_note_card(data, uid):
     bg_img.alpha_composite(role_img, (1220, 200))
     now = datetime.datetime.now().strftime('%m月%d日%H:%M')
     bg_draw.text((554, 1794), 'Created by LittlePaimon·' + now, fill='#5680d2', font=get_font(40, '优设标题黑.ttf'))
-    bg_img = bg_img.resize((int(bg_img.size[0] * 0.37), int(bg_img.size[1] * 0.37)), Image.ANTIALIAS)
-    bg_img = pil2b64(bg_img)
+    bg_img = bg_img.resize((int(bg_img.size[0] * 0.35), int(bg_img.size[1] * 0.35)), Image.ANTIALIAS)
+    bg_img = pil2b64(bg_img, 70)
     bg_img = MessageSegment.image(bg_img)
     return bg_img

Paimon_Wiki/__init__.py

@@ -1,11 +1,9 @@
 import os
-from PIL import Image
-from pathlib import Path
 from nonebot import on_endswith, on_command, on_regex
 from nonebot.params import RegexDict
 from nonebot.adapters.onebot.v11 import MessageSegment, MessageEvent
 from ..utils.character_alias import get_id_by_alias
-from ..utils.util import pil2b64, exception_handler
+from ..utils.util import exception_handler
 from .blue import get_blue_pic
 from .abyss_rate_draw import draw_rate_rank, draw_teams_rate
 import re
@@ -40,15 +38,12 @@ abyss_team = on_regex(r'^(深渊|深境螺旋)(?P<floor>上半|下半)阵容(排
 async def genshin_guide(event: MessageEvent):
     name: str = event.message.extract_plain_text().replace('角色攻略', '').strip()
     realname = get_id_by_alias(name)
-    if not realname:
-        await guide.finish(f'没有找到{name}的攻略', at_sender=True)
-    elif realname[1][0] in ['八重神子', '神里绫华', '神里绫人', '温迪', '七七', '雷电将军']:
-        path = os.path.join(res_path, 'role_guide', f'{realname[1][0]}.png')
-        img = MessageSegment.image(file=Path(path))
-        await guide.finish(img, at_sender=True)
+    if name in ['风主', '岩主', '雷主'] or realname:
+        name = realname[1][0] if name not in ['风主', '岩主', '雷主'] else name
+        img = MessageSegment.image(file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/XFGuide/{name}.jpg')
+        await guide.finish(img)
     else:
-        img = MessageSegment.image(file=f'https://adachi-bot.oss-cn-beijing.aliyuncs.com/Version2/guide/{realname[1][0]}.png')
-        await guide.finish(img, at_sender=True)
+        await guide.finish(f'没有找到{name}的攻略', at_sender=True)
 
 
 @material.handle()
@@ -56,51 +51,40 @@ async def genshin_guide(event: MessageEvent):
 async def genshin_material(event: MessageEvent):
     name: str = event.message.extract_plain_text().replace('角色材料', '').strip()
     realname = get_id_by_alias(name)
-    if name in ['夜兰', '久岐忍']:
-        path = os.path.join(res_path, "role_material", f"{name}材料.png")
-        img = MessageSegment.image(file=Path(path))
-        await material.finish(img, at_sender=True)
-    elif not realname:
-        await material.finish(f'没有找到{name}的材料', at_sender=True)
+    if name in ['夜兰', '久岐忍'] or realname:
+        name = realname[1][0] if realname else name
+        print(name)
+        img = MessageSegment.image(
+            file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/RoleMaterials/{name}材料.jpg')
+        await material.finish(img)
     else:
-        path = os.path.join(res_path, 'role_material', f'{realname[1][0]}材料.png')
-        img = MessageSegment.image(file=Path(path))
-        await material.finish(img, at_sender=True)
+        await material.finish(f'没有找到{name}的材料', at_sender=True)
 
 
 @attribute.handle()
 @exception_handler()
 async def genshinAttribute(event: MessageEvent):
     name: str = event.message.extract_plain_text().replace('参考面板', '').strip()
-    if name not in ['风主', '岩主', '雷主']:
     realname = get_id_by_alias(name)
-        if not realname:
-            await attribute.finish(f'没有找到{name}的参考面板', at_sender=True)
-            return
-        realname = realname[1][0]
+    if name in ['风主', '岩主', '雷主'] or realname:
+        name = realname[1][0] if name not in ['风主', '岩主', '雷主'] else name
+        img = await get_blue_pic(name)
+        await attribute.finish(MessageSegment.image(file=img))
     else:
-        realname = name
-    pic_data = get_blue_pic(realname)
-    pic = Image.open(os.path.join(res_path, 'blue', f'{pic_data[0]}.jpg'))
-    pic = pic.crop((0, pic_data[1][0], 1080, pic_data[1][1]))
-    pic = pil2b64(pic, 85)
-    await attribute.finish(MessageSegment.image(pic), at_sender=True)
+        await attribute.finish(f'没有找到{name}的参考面板', at_sender=True)
 
 
 @attribute2.handle()
 @exception_handler()
 async def genshinAttribute2(event: MessageEvent):
     name: str = event.message.extract_plain_text().replace('收益曲线', '').strip()
-    if name not in ['风主', '岩主', '雷主']:
     realname = get_id_by_alias(name)
-        if not realname:
-            await attribute2.finish(f'没有找到{name}的参考面板', at_sender=True)
-        realname = realname[1][0]
+    if name in ['风主', '岩主', '雷主'] or realname:
+        name = realname[1][0] if name not in ['风主', '岩主', '雷主'] else name
+        img = MessageSegment.image(file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/blue/{name}.jpg')
+        await attribute2.finish(img)
     else:
-        realname = name
-    pic = Image.open(os.path.join(res_path, 'blue', f'{realname}.png'))
-    pic = pil2b64(pic, 85)
-    await attribute2.finish(MessageSegment.image(pic), at_sender=True)
+        await attribute2.finish(f'没有找到{name}的收益曲线', at_sender=True)
 
 
 @daily_material.handle()
@@ -127,12 +111,15 @@ async def daily_material_handle(event: MessageEvent):
             if week == "0":
                 await daily_material.finish('周日所有材料都可以刷哦!', at_sender=True)
             elif week in ['1', '4']:
-                path = os.path.join(res_path, "daily_material", "周一周四.jpg")
+                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                                                '/DailyMaterials/周一周四.jpg')
             elif week in ['2', '5']:
-                path = os.path.join(res_path, "daily_material", "周二周五.jpg")
+                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                                                '/DailyMaterials/周二周五.jpg')
             else:
-                path = os.path.join(res_path, "daily_material", "周三周六.jpg")
-            await daily_material.finish(MessageSegment.image(file=Path(path)), at_sender=True)
+                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                                                '/DailyMaterials/周三周六.jpg')
+            await daily_material.finish(img)
 
 
 @abyss_rate.handle()

Paimon_Wiki/blue.py

@@ -1,3 +1,5 @@
+from ..utils.util import get_pic, pil2b64
+
 blue = {
     '胡桃': ['火', (0, 1886)],
     '托马': ['火', (1886, 2420)],
@@ -54,8 +56,11 @@ blue = {
 }
 
 
-def get_blue_pic(name):
+async def get_blue_pic(name):
     for c in blue.items():
         if c[0] == name:
-            return c[1]
+            img = await get_pic(f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/blue/{c[1][0]}.jpg')
+            img = img.crop((0, c[1][1][0], 1080, c[1][1][1]))
+            img = pil2b64(img, 100)
+            return img
     return None

utils/character_alias.py

@@ -1,9 +1,9 @@
 character_alias = {
-    10000002: ['神里绫华', '绫华', '大小姐', '小乌龟', '白鹭公主', '0华', '神里', '神里妹'],
+    10000002: ['神里绫华', '绫华', '大小姐', '小乌龟', '白鹭公主', '0华', '神里', '神里妹', '凌华', '神里凌华'],
     10000003: ['琴', '团长', '琴团长', '蒲公英骑士'],
-    10000005: ['空', '空哥', '龙哥', '哥哥', '旅行者'],
+    10000005: ['空', '空哥', '龙哥', '哥哥', '旅行者', '主角'],
     10000006: ['丽莎', '蔷薇魔女'],
-    10000007: ['荧', '荧妹', '爷', '妹妹', '旅行者'],
+    10000007: ['荧', '荧妹', '爷', '妹妹', '旅行者', '主角'],
     10000014: ['芭芭拉', '偶像', '内鬼', '牧师'],
     10000015: ['凯亚', '凝冰渡海真君', '矿工'],
     10000016: ['迪卢克', '卢姥爷', '姥爷', '老爷', '卢锅巴', '正义人', '正e人', '落魄人'],
@@ -47,7 +47,7 @@ character_alias = {
     10000062: ['埃洛伊'],
     10000063: ['申鹤', '小姨', '小姨妈'],
     10000064: ['云堇', '云先生'],
-    10000066: ['神里绫人', '0人', '大舅子', '小舅子', '绫人', '神里哥']
+    10000066: ['神里绫人', '0人', '大舅子', '小舅子', '绫人', '神里哥', '凌人', '神里凌人']
 }
 short_name = {
     '胡桃': '胡桃',

utils/util.py

@@ -11,6 +11,7 @@ import functools
 import inspect
 import json
 import asyncio
+from PIL import Image
 from json import JSONDecodeError
 from aiohttp import ClientSession
 from nonebot import get_bot
@@ -83,15 +84,15 @@ def exception_handler():
                 await func(**kwargs)
             except FinishedException:
                 raise
-            except ActionFailed as e:
+            except ActionFailed:
                 logger.exception('账号可能被风控，消息发送失败')
-                await get_bot().send(event, f'派蒙可能被风控，消息发送失败，{e.info["wording"]}')
+                await get_bot().send(event, f'派蒙可能被风控，也可能是没有该图片资源，消息发送失败')
             except JSONDecodeError:
                 await get_bot().send(event, '派蒙获取信息失败，重试一下吧')
-            except IndexError or KeyError as e:
-                await get_bot().send(event, f'派蒙获取信息失败，请确认参数无误，{e}')
-            except TypeError or AttributeError as e:
-                await get_bot().send(event, f'派蒙好像没有该UID的绑定信息， {e}')
+            # except IndexError or KeyError as e:
+            #     await get_bot().send(event, f'派蒙获取信息失败，请确认参数无误，{e}')
+            # except TypeError or AttributeError as e:
+            #     await get_bot().send(event, f'派蒙好像没有该UID的绑定信息， {e}')
             except FileNotFoundError as e:
                 file_name = re.search(r'\'(.*)\'', str(e)).group(1)
                 file_name = file_name.replace('\\\\', '/').split('/')
@@ -137,6 +138,14 @@ class FreqLimiter2:
         return int(self.next_time[key1][key2] - time()) + 1
 
 
+async def get_pic(url):
+    async with ClientSession() as session:
+        res = await session.get(url)
+        res = await res.read()
+        img = Image.open(BytesIO(res))
+        return img
+
+
 # 获取可用的cookie
 async def get_use_cookie(user_id, uid='', mys_id='', action=''):
     cache_cookie = await get_cookie_cache(uid, 'uid')