Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-07 01:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[+] mai2: support adding rival

Browse Source
This commit is contained in:
Clansty
2024-08-05 20:37:18 +08:00
parent 94ba1f0b09
commit 473f4a4295
14 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
View File

@@ -24,7 +24,7 @@ abstract class GameApiController<T : IUserData>(name: String, userDataClass: KCl
@API("trend")
abstract suspend fun trend(@RP username: String): List<TrendOut>
@API("user-summary")
abstract suspend fun userSummary(@RP username: String): GenericGameSummary
abstract suspend fun userSummary(@RP username: String, @RP token: String?): GenericGameSummary
@API("recent")
suspend fun recent(@RP username: String): List<IGenericGamePlaylog> = us.cardByName(username) { card ->
@@ -93,7 +93,7 @@ abstract class GameApiController<T : IUserData>(name: String, userDataClass: KCl
}
}
fun genericUserSummary(card: Card, ratingComp: Map<String, String>): GenericGameSummary {
fun genericUserSummary(card: Card, ratingComp: Map<String, String>, rival: Boolean? = null): GenericGameSummary {
// Summary values: total plays, player rating, server-wide ranking
// number of each rank, max combo, number of full combo, number of all perfect
val user = userDataRepo.findByCard(card) ?: (404 - "Game data not found")
@@ -138,7 +138,8 @@ abstract class GameApiController<T : IUserData>(name: String, userDataClass: KCl
lastVersion = user.lastRomVersion,
ratingComposition = ratingComp,
recent = plays.sortedBy { it.userPlayDate.toString() }.takeLast(15).reversed(),
lastPlayedHost = us.userRepo.findByKeychip(user.lastClientId)?.username
lastPlayedHost = us.userRepo.findByKeychip(user.lastClientId)?.username,
rival = rival
)
}
}
}

4
src/main/java/icu/samnyan/aqua/net/games/Models.kt
View File

@@ -45,7 +45,9 @@ data class GenericGameSummary(
val ratingComposition: Map<String, Any>,
val recent: List<IGenericGamePlaylog>
val recent: List<IGenericGamePlaylog>,
val rival: Boolean?
)
data class GenericRankingPlayer(

4
src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt
View File

@@ -29,7 +29,7 @@ class Chusan(
"userName" to usernameCheck(SEGA_USERNAME_CAHRS)
) }
override suspend fun userSummary(@RP username: Str) = us.cardByName(username) { card ->
override suspend fun userSummary(@RP username: Str, @RP token: String?) = us.cardByName(username) { card ->
// Summary values: total plays, player rating, server-wide ranking
// number of each rank, max combo, number of full combo, number of all perfect
val extra = userGeneralDataRepository.findByUser_Card_ExtId(card.extId)
@@ -41,4 +41,4 @@ class Chusan(
genericUserSummary(card, ratingComposition)
}
}
}

53
src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt
View File

@@ -17,7 +17,7 @@ class Maimai2(
override val playlogRepo: Mai2UserPlaylogRepo,
override val userDataRepo: Mai2UserDataRepo,
val repos: Mai2Repos,
): GameApiController<Mai2UserDetail>("mai2", Mai2UserDetail::class) {
) : GameApiController<Mai2UserDetail>("mai2", Mai2UserDetail::class) {
override suspend fun trend(@RP username: Str): List<TrendOut> = us.cardByName(username) { card ->
findTrend(playlogRepo.findByUserCardExtId(card.extId)
.map { TrendLog(it.playDate, it.afterRating) })
@@ -25,11 +25,13 @@ class Maimai2(
// Only show > S rank
override val shownRanks = mai2Scores.filter { it.first >= 97 * 10000 }
override val settableFields: Map<String, (Mai2UserDetail, String) -> Unit> by lazy { mapOf(
"userName" to usernameCheck(SEGA_USERNAME_CAHRS),
) }
override val settableFields: Map<String, (Mai2UserDetail, String) -> Unit> by lazy {
mapOf(
"userName" to usernameCheck(SEGA_USERNAME_CAHRS),
)
}
override suspend fun userSummary(@RP username: Str) = us.cardByName(username) { card ->
override suspend fun userSummary(@RP username: Str, @RP token: String?) = us.cardByName(username) { card ->
val extra = repos.userGeneralData.findByUser_Card_ExtId(card.extId)
.associate { it.propertyKey to it.propertyValue }
@@ -38,7 +40,20 @@ class Maimai2(
"best15" to (extra["recent_rating_new"] ?: "")
)
genericUserSummary(card, ratingComposition)
// if isLogin than boolean or null
// use the type to check user login in frontend
val isMyRival = token?.let { t ->
us.jwt.auth(t) { u ->
if (u.username == username) return@auth null
us.cardByName(u.username) { myCard ->
val user = repos.userData.findByCardExtId(card.extId).orElse(null) ?: (404 - "User not found")
val myRival = repos.userGeneralData.findByUser_Card_ExtIdAndPropertyKey(myCard.extId, "favorite_rival").map { it.propertyValue.split(',') }.orElse(emptyList()).map { it.long() }
myRival.contains(user.id)
}
}
}
genericUserSummary(card, ratingComposition, isMyRival)
}
@API("user-rating")
@@ -100,4 +115,30 @@ class Maimai2(
}
mapOf("newName" to newNameFull)
}
@PostMapping("set-rival")
suspend fun setRival(@RP token: String, @RP rivalUserName: String, @RP isAdd: Boolean) = us.jwt.auth(token) { u ->
us.cardByName(u.username) { myCard ->
val rivalCard = us.cardByName(rivalUserName) { it }
val rivalUser = repos.userData.findByCardExtId(rivalCard.extId).orElse(null) ?: (404 - "User not found")
val myRival = repos.userGeneralData.findByUser_Card_ExtIdAndPropertyKey(myCard.extId, "favorite_rival").orElse(null)
?: Mai2UserGeneralData().apply {
user = repos.userData.findByCardExtId(myCard.extId).orElse(null) ?: (404 - "User not found")
propertyKey = "favorite_rival"
}
val myRivalList = myRival.propertyValue.split(',').toMutableSet()
if (isAdd && myRivalList.size >= 4) {
(400 - "Rival list is full")
} else if (isAdd) {
myRivalList.add(rivalUser.id.toString())
} else {
myRivalList.remove(rivalUser.id.toString())
}
myRival.propertyValue = myRivalList.joinToString(",")
repos.userGeneralData.save(myRival)
}
SUCCESS
}
}

4
src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt
View File

@@ -28,7 +28,7 @@ class Ongeki(
"userName" to usernameCheck(SEGA_USERNAME_CAHRS)
) }
override suspend fun userSummary(username: String) = us.cardByName(username) { card ->
override suspend fun userSummary(username: String, token: String?) = us.cardByName(username) { card ->
val extra = userGeneralDataRepository.findByUser_Card_ExtId(card.extId)
.associate { it.propertyKey to it.propertyValue }
@@ -40,4 +40,4 @@ class Ongeki(
genericUserSummary(card, ratingComposition)
}
}
}

4
src/main/java/icu/samnyan/aqua/net/games/wacca/Wacca.kt
View File

@@ -25,10 +25,10 @@ class Wacca(
.map { TrendLog(it.userPlayDate.utc().isoDate(), it.afterRating) })
}
override suspend fun userSummary(@RP username: String) = us.cardByName(username) { card ->
override suspend fun userSummary(@RP username: String, @RP token: String?) = us.cardByName(username) { card ->
// TODO: Rating composition
genericUserSummary(card, mapOf())
}
override val shownRanks: List<Pair<Int, String>> = waccaScores.filter { it.first > 85 * 10000 }
}
}

4
src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt
View File

@@ -122,11 +122,13 @@ class Maimai2ServletController(
val getUserRivalData = UserReqHandler { req, userId ->
val rivalId = parsing { (req["rivalId"] as Number).toLong() }
// rivalId should store and fetch with the id column of table rather than card_ext_id
// or user will be able to get others' ext_id by setting them as rival
mapOf(
"userId" to userId,
"userRivalData" to mapOf(
"rivalId" to rivalId,
"rivalName" to (repos.userData.findByCardExtId(rivalId)()?.userName ?: "")
"rivalName" to (repos.userData.findById(rivalId)()?.userName ?: "")
)
)
}

2
src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalMusicHandler.java
View File

@@ -38,7 +38,7 @@ public class GetUserRivalMusicHandler implements BaseHandler {
long userId = ((Number) request.get("userId")).longValue();
long rivalId = ((Number) request.get("rivalId")).intValue();
List<Mai2UserMusicDetail> details = userMusicDetailRepository.findByUser_Card_ExtId(rivalId);
List<Mai2UserMusicDetail> details = userMusicDetailRepository.findByUserId(rivalId);
List<UserRivalMusic> userRivalMusicList = new LinkedList<>();
Map<Integer, UserRivalMusic> userRivalMusicMap = new HashMap<>();
for (Mai2UserMusicDetail detail : details) {

2
src/main/java/icu/samnyan/aqua/sega/maimai2/model/Repos.kt
View File

@@ -96,6 +96,8 @@ interface Mai2UserMusicDetailRepo : Mai2UserLinked<Mai2UserMusicDetail> {
fun findByUserAndMusicIdAndLevel(user: Mai2UserDetail, musicId: Int, level: Int): Optional<Mai2UserMusicDetail>
fun findByUser_Card_ExtIdAndMusicIdIn(userId: Long, musicId: List<Int>): List<Mai2UserMusicDetail>
fun findByUserId(userId: Long): List<Mai2UserMusicDetail>
}
interface Mai2UserOptionRepo : Mai2UserLinked<Mai2UserOption>