From 7e525e0c7ead7ea62d2e070795b91ddc3b8482ed Mon Sep 17 00:00:00 2001
From: 7a1dd609-d238-4580-9d5f-ee8412b0f5bc
 <7a1dd609-d238-4580-9d5f-ee8412b0f5bc@bankofchina.com>
Date: Wed, 5 Feb 2025 16:20:02 +0800
Subject: [PATCH] feat: add isNew func

---
 bonus9.py     | 20 +++++++++++++++++++-
 map_clear.py  | 18 +++++++++++++++++-
 mapstock.py   | 20 +++++++++++++-------
 music.py      | 19 ++++++++++++++++++-
 unlock_all.py | 13 ++++++++++++-
 5 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/bonus9.py b/bonus9.py
index 45d2248..c66a238 100644
--- a/bonus9.py
+++ b/bonus9.py
@@ -214,6 +214,24 @@ def music(userId, bonus_list):
 
     user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId))
 
+    data = json.dumps({
+        "userId": int(userId),
+        "nextIndex": musicId,
+        "maxCount": 1
+    })
+    user_music =  json.loads(sdgb_api(data, "GetUserMusicApi", userId))
+
+    isNew = "0"
+    try:
+        for item in user_music['userMusicList'][0]['userMusicDetailList']:
+            if item['musicId'] == musicId and item['level'] == level:
+                isNew = "1"
+                break
+            else:
+                continue
+    except:
+        pass
+
     # UserAll
 
     data = json.dumps({
@@ -362,7 +380,7 @@ def music(userId, bonus_list):
             "isNewMapList": "",
             "isNewLoginBonusList": "0" * len(bonus_list),
             "isNewItemList": "",
-            "isNewMusicDetailList": "1",
+            "isNewMusicDetailList": isNew,
             "isNewCourseList": "0",
             "isNewFavoriteList": "",
             "isNewFriendSeasonRankingList": ""
diff --git a/map_clear.py b/map_clear.py
index 8e2dc5b..1a8a1b5 100644
--- a/map_clear.py
+++ b/map_clear.py
@@ -214,7 +214,23 @@ def music(userId, mapId, distance, item_list, character_list, isNewMapList):
 
     user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId))
 
+    data = json.dumps({
+        "userId": int(userId),
+        "nextIndex": musicId,
+        "maxCount": 1
+    })
+    user_music =  json.loads(sdgb_api(data, "GetUserMusicApi", userId))
 
+    isNew = "0"
+    try:
+        for item in user_music['userMusicList'][0]['userMusicDetailList']:
+            if item['musicId'] == musicId and item['level'] == level:
+                isNew = "1"
+                break
+            else:
+                continue
+    except:
+        pass
 
 
     # UserAll
@@ -372,7 +388,7 @@ def music(userId, mapId, distance, item_list, character_list, isNewMapList):
             "isNewMapList": isNewMapList,
             "isNewLoginBonusList": "",
             "isNewItemList": "1" * len(item_list),
-            "isNewMusicDetailList": "1",
+            "isNewMusicDetailList": isNew,
             "isNewCourseList": "0",
             "isNewFavoriteList": "",
             "isNewFriendSeasonRankingList": ""
diff --git a/mapstock.py b/mapstock.py
index 453fbd3..28d9a5e 100644
--- a/mapstock.py
+++ b/mapstock.py
@@ -6,12 +6,7 @@ import random
 from sdgb import sdgb_api
 from datetime import datetime, timedelta
 
-from settings import music_data
-from settings import regionId
-from settings import regionName
-from settings import clientId
-from settings import placeId
-from settings import placeName
+from settings import music_data, regionId, regionName, clientId, placeId, placeName
 
 from login import login
 from logout import logout
@@ -217,6 +212,17 @@ def music(userId):
 
     user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId))
 
+    isNew = "0"
+    try:
+        for item in user_music['userMusicList'][0]['userMusicDetailList']:
+            if item['musicId'] == musicId and item['level'] == level:
+                isNew = "1"
+                break
+            else:
+                continue
+    except:
+        pass
+
     # UserAll
 
     data = json.dumps({
@@ -365,7 +371,7 @@ def music(userId):
             "isNewMapList": "",
             "isNewLoginBonusList": "",
             "isNewItemList": "",
-            "isNewMusicDetailList": "1",
+            "isNewMusicDetailList": isNew,
             "isNewCourseList": "0",
             "isNewFavoriteList": "",
             "isNewFriendSeasonRankingList": ""
diff --git a/music.py b/music.py
index 0a66fd7..cfc0ee7 100644
--- a/music.py
+++ b/music.py
@@ -211,6 +211,23 @@ def music(userId, music_data):
 
     user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId))
 
+    data = json.dumps({
+        "userId": int(userId),
+        "nextIndex": musicId,
+        "maxCount": 1
+    })
+    user_music =  json.loads(sdgb_api(data, "GetUserMusicApi", userId))
+
+    isNew = "1"
+    try:
+        for item in user_music['userMusicList'][0]['userMusicDetailList']:
+            if item['musicId'] == musicId and item['level'] == level:
+                isNew = "0"
+                break
+            else:
+                continue
+    except:
+        pass
 
     # UserAll
 
@@ -360,7 +377,7 @@ def music(userId, music_data):
             "isNewMapList": "",
             "isNewLoginBonusList": "",
             "isNewItemList": "",
-            "isNewMusicDetailList": "0",
+            "isNewMusicDetailList": isNew,
             "isNewCourseList": "0",
             "isNewFavoriteList": "",
             "isNewFriendSeasonRankingList": ""
diff --git a/unlock_all.py b/unlock_all.py
index afd5cbd..4178766 100644
--- a/unlock_all.py
+++ b/unlock_all.py
@@ -506,6 +506,17 @@ def music(userId):
 
     user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId))
 
+    isNew = "0"
+    try:
+        for item in user_music['userMusicList'][0]['userMusicDetailList']:
+            if item['musicId'] == musicId and item['level'] == level:
+                isNew = "1"
+                break
+            else:
+                continue
+    except:
+        pass
+
     # UserAll
 
     data = json.dumps({
@@ -654,7 +665,7 @@ def music(userId):
             "isNewMapList": "",
             "isNewLoginBonusList": "",
             "isNewItemList": "1" * len(music_item()),
-            "isNewMusicDetailList": "1",
+            "isNewMusicDetailList": isNew,
             "isNewCourseList": "0",
             "isNewFavoriteList": "",
             "isNewFriendSeasonRankingList": ""