From 4c3ed1d0da29fce3b6b59d38d80e639c38dda9f1 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sun, 5 Jan 2025 04:13:38 -0500
Subject: [PATCH] [F] Fix recentNBMusicList return

---
 .../icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt    | 8 +++++---
 .../java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt  | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
index c7a3136b..0345fd79 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanApis.kt
@@ -30,11 +30,13 @@ fun ChusanController.chusanInit() {
     "GetUserSymbolChatSetting" { """{"userId":"${data["userId"]}","length":"0","symbolChatInfoList":[]}""" }
 
     // Net battle data
-    "GetUserNetBattleData" {
-        val misc = db.userMisc.findSingleByUser_Card_ExtId(uid)()
+    "GetUserNetBattleData" api@ {
+        val u = db.userData.findByCard_ExtId(uid)() ?: return@api null
+        val misc = db.userMisc.findSingleByUser(u)()
+        val recent = db.netBattleLog.findTop20ByUserOrderByIdDesc(u)
         mapOf("userId" to uid, "userNetBattleData" to mapOf(
             "recentNBSelectMusicList" to (misc?.recentNbSelect ?: empty),
-            "recentNBMusicList" to (misc?.recentNbMusic ?: empty),
+            "recentNBMusicList" to recent.map { it.toDict() },
         ))
     }
     "GetUserNetBattleRankingInfo" { """{"userId":"${data["userId"]}","length":"0","userNetBattleRankingInfoList":{}}""" }
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt
index 51d4b597..4396b026 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/Chu3Repos.kt
@@ -127,7 +127,9 @@ interface Chu3UserCMissionProgressRepo : Chu3UserLinked<UserCMissionProgress> {
     fun findByUser_Card_ExtIdAndMissionIdAndOrder(extId: Long, missionId: Int, order: Int): Optional<UserCMissionProgress>
 }
 
-interface Chu3NetBattleLogRepo : Chu3UserLinked<Chu3NetBattleLog>
+interface Chu3NetBattleLogRepo : Chu3UserLinked<Chu3NetBattleLog> {
+    fun findTop20ByUserOrderByIdDesc(user: Chu3UserData): List<Chu3NetBattleLog>
+}
 
 interface Chu3UserMiscRepo : Chu3UserLinked<Chu3UserMisc>