✨ 支持查询上期新深渊

Author: KimigaiiWuyi

GenshinUID/genshinuid_poetry_abyss/__init__.py

@@ -12,7 +12,18 @@
 
 
 @sv_poetry_abyss.on_command(
-    ('查询幻想真境剧诗', '幻想真境剧诗', '新深渊', '查询新深渊', '真剧诗'),
+    (
+        '查询幻想真境剧诗',
+        '幻想真境剧诗',
+        '新深渊',
+        '查询新深渊',
+        '真剧诗',
+        '查询上期幻想真境剧诗',
+        '上期幻想真境剧诗',
+        '上期新深渊',
+        '查询上期新深渊',
+        '上期真剧诗',
+    ),
     block=True,
 )
 async def send_poetry_abyss_info(bot: Bot, ev: Event):
@@ -26,6 +37,10 @@ async def send_poetry_abyss_info(bot: Bot, ev: Event):
         return await bot.send(UID_HINT)
     await bot.logger.info('[幻想真境剧诗]uid: {}'.format(uid))
 
-    im = await draw_poetry_abyss_img(uid, ev)
+    if '上期' in ev.command:
+        active = 2
+    else:
+        active = None
+    im = await draw_poetry_abyss_img(uid, ev, active)
 
     await bot.send(im)

GenshinUID/genshinuid_poetry_abyss/draw_poetry_abyss.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from datetime import datetime
-from typing import List, Union
+from typing import List, Union, Optional
 
 from PIL import Image, ImageDraw
 from gsuid_core.models import Event
@@ -63,8 +63,10 @@ async def draw_buff(
         )
 
 
-async def draw_poetry_abyss_img(uid: str, ev: Event) -> Union[str, bytes]:
-    data = await mys_api.get_poetry_abyss_data(uid)
+async def draw_poetry_abyss_img(
+    uid: str, ev: Event, active: Optional[int] = None
+) -> Union[str, bytes]:
+    data = await mys_api.get_poetry_abyss_data(uid, active)
     if isinstance(data, int):
         return get_error(data)
 

GenshinUID/utils/api/mys/mys_api.py

@@ -1,5 +1,5 @@
 from copy import deepcopy
-from typing import Dict, List, Union, cast
+from typing import Dict, List, Union, Optional, cast
 
 from gsuid_core.utils.api.mys_api import _MysApi
 from gsuid_core.utils.api.mys.api import RECORD_BASE, RECORD_BASE_OS
@@ -87,7 +87,9 @@ async def get_widget_resin_data(self, uid: str) -> Union[WidgetResin, int]:
         return data
 
     async def get_poetry_abyss_data(
-        self, uid: str
+        self,
+        uid: str,
+        active: Optional[int] = None,
     ) -> Union[PoetryAbyssDatas, int]:
         server_id = self.RECOGNIZE_SERVER.get(uid[0])
         base = RECORD_BASE_OS if self.check_os(uid) else RECORD_BASE
@@ -101,6 +103,8 @@ async def get_poetry_abyss_data(
             'role_id': uid,
             'need_detail': True,
         }
+        if active:
+            params['active'] = active
         HEADER['DS'] = get_ds_token(
             '&'.join([f'{k}={v}' for k, v in params.items()])
         )