diff --git a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt index 13ade343..d2fd3dba 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chu3Import.kt @@ -64,9 +64,10 @@ data class Chu3DataExport( var userMapList: List, var userMusicDetailList: List, var userPlaylogList: List, - var userGeneralDataList: List, - var userMiscList: Chu3UserMisc + var userMateList: List = emptyList(), + var userGeneralDataList: List = emptyList(), + var userMiscList: Chu3UserMisc = Chu3UserMisc(), ): IExportClass { constructor() : this("SDHD", - Chu3UserData(), UserGameOption(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), Chu3UserMisc()) + Chu3UserData(), UserGameOption(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(), Chu3UserMisc()) } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt index 74aab168..33ec5287 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt @@ -19,11 +19,14 @@ fun Maimai2ServletController.initApis() { "userExtend" to (db.userExtend.findSingleByUser_Card_ExtId(uid) ?: (404 - "User not found")) ) } - "GetUserData" { mapOf( - "userId" to uid, - "userData" to (db.userData.findByCardExtId(uid) ?: (404 - "User not found")), - "banState" to 0 - ) } + "GetUserData" { + val user = db.userData.findByCardExtId(uid) ?: (404 - "User not found") + mapOf( + "userId" to uid, + "userData" to user, + "banState" to user.banState + ) + } "GetUserLoginBonus".unpaged { db.userLoginBonus.findByUser_Card_ExtId(uid) } "GetUserMap".unpaged { db.userMap.findByUser_Card_ExtId(uid) } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt index a5903a96..72e489b6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt @@ -136,6 +136,7 @@ class Mai2UserDetail( var totalReMasterAchievement: Long = 0, var playerOldRating: Long = 0, var playerNewRating: Long = 0, + @JsonIgnore var banState: Int = 0, var dateTime: Long = 0,