From 792b2032554fcb8119f56f2f8b8c155f3daf9492 Mon Sep 17 00:00:00 2001 From: Stedoss <29103029+Stedoss@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:46:20 +0000 Subject: [PATCH] Add `mods_bitwise` to score endpoints --- nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt | 1 + .../main/kotlin/com/nisemoe/nise/database/ScoreService.kt | 5 ++++- .../kotlin/com/nisemoe/nise/database/UserScoreService.kt | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt index 48a3bc5..6517d84 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/Models.kt @@ -141,6 +141,7 @@ data class ReplayData( val beatmap_count_sliders: Int?, val beatmap_count_spinners: Int?, val score: Int, + val mods_bitwise: Int, val mods: List, val rank: String?, val ur: Double?, diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt index b1db96f..33d9bf3 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/ScoreService.kt @@ -177,6 +177,8 @@ class ScoreService( val hitDistribution = this.getHitDistribution(scoreId = result.get(SCORES.ID, Int::class.java)) val charts = this.getCharts(result) + val mods = result.get(SCORES.MODS, Int::class.java) + val replayData = ReplayData( replay_id = replayId, user_id = result.get(SCORES.USER_ID, Int::class.java), @@ -204,7 +206,8 @@ class ScoreService( ur = result.get(SCORES.UR, Double::class.java), adjusted_ur = result.get(SCORES.ADJUSTED_UR, Double::class.java), score = result.get(SCORES.SCORE, Int::class.java), - mods = Mod.parseModCombination(result.get(SCORES.MODS, Int::class.java)), + mods_bitwise = mods, + mods = Mod.parseModCombination(mods), rank = result.get(SCORES.RANK, String::class.java), snaps = result.get(SCORES.SNAPS, Int::class.java), hits = result.get(SCORES.EDGE_HITS, Int::class.java), diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt index 23ec651..b9a5cca 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/database/UserScoreService.kt @@ -76,6 +76,8 @@ class UserScoreService( val hitDistribution = this.getHitDistribution(result.get(USER_SCORES.JUDGEMENTS, ByteArray::class.java)) val charts = this.scoreService.getCharts(result) + val mods = result.get(USER_SCORES.MODS, Int::class.java) + val replayData = ReplayData( replay_id = result.get(USER_SCORES.ONLINE_SCORE_ID, Long::class.java), username = result.get(USER_SCORES.PLAYER_NAME, String::class.java), @@ -100,7 +102,8 @@ class UserScoreService( ur = result.get(USER_SCORES.UR, Double::class.java), adjusted_ur = result.get(USER_SCORES.ADJUSTED_UR, Double::class.java), score = result.get(USER_SCORES.TOTAL_SCORE, Int::class.java), - mods = Mod.parseModCombination(result.get(USER_SCORES.MODS, Int::class.java)), + mods_bitwise = mods, + mods = Mod.parseModCombination(mods), snaps = result.get(USER_SCORES.SNAPS, Int::class.java), hits = result.get(USER_SCORES.EDGE_HITS, Int::class.java), perfect = result.get(USER_SCORES.PERFECT, Boolean::class.java),