From 259ff6b6a06b44559b1ee777690b02eb9bbd0cf2 Mon Sep 17 00:00:00 2001
From: xtaodada <xtao@xtaolink.cn>
Date: Thu, 1 Aug 2024 16:51:56 +0800
Subject: [PATCH] :bug: Fix role combat query previous data

---
 plugins/genshin/role_combat.py  | 11 ++++++++---
 plugins/jobs/refresh_history.py |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/genshin/role_combat.py b/plugins/genshin/role_combat.py
index 2c27d8ea..cd190a7e 100644
--- a/plugins/genshin/role_combat.py
+++ b/plugins/genshin/role_combat.py
@@ -174,16 +174,21 @@ class RoleCombatPlugin(Plugin):
         self, client: GenshinClient, uid: int, previous: bool
     ) -> Tuple["ImgTheaterData", Dict[int, int]]:
         abyss_data = await client.get_genshin_imaginarium_theater(
-            uid, need_detail=not client.public, previous=previous, lang="zh-cn"
+            uid, need_detail=not client.public, lang="zh-cn"
         )  # noqa
         avatar_data = {}
         if (not abyss_data.unlocked) or (not abyss_data.data):
             raise AbyssUnlocked
-        abyss_data = abyss_data.data[0]
+        index = 1 if previous else 0
+        if len(abyss_data.data) <= index:
+            raise AbyssUnlocked
+        abyss_data = abyss_data.data[index]
+        if not abyss_data.has_data:
+            raise AbyssUnlocked
         if not client.public:  # noqa
             avatars = await client.get_genshin_characters(uid, lang="zh-cn")
             avatar_data = {i.id: i.constellation for i in avatars}
-            if abyss_data.has_data and abyss_data.has_detail_data and abyss_data.detail:
+            if abyss_data.has_detail_data and abyss_data.detail:
                 await self.save_abyss_data(self.history_data_abyss, uid, abyss_data, avatar_data)
         return abyss_data, avatar_data
 
diff --git a/plugins/jobs/refresh_history.py b/plugins/jobs/refresh_history.py
index 71df2253..5b69ddd4 100644
--- a/plugins/jobs/refresh_history.py
+++ b/plugins/jobs/refresh_history.py
@@ -113,7 +113,7 @@ class RefreshHistoryJob(Plugin):
 
     async def save_img_theater_data(self, client: "GenshinClient", avatar_data: Dict[int, int]) -> bool:
         uid = client.player_id
-        abyss_data = await client.get_genshin_imaginarium_theater(uid, previous=False, lang="zh-cn")
+        abyss_data = await client.get_genshin_imaginarium_theater(uid, lang="zh-cn")
         if abyss_data.unlocked and abyss_data.data:
             data = abyss_data.data[0]
             if data.has_data and data.has_detail_data and data.detail: