From ae6b613ae004670ccb76aa6e05ffc5ef9d048bcb Mon Sep 17 00:00:00 2001 From: asterisk727 <59166650+asterisk727@users.noreply.github.com> Date: Thu, 17 Sep 2026 02:10:10 +0900 Subject: [PATCH] fix: ongeki actually use dedupe+search by level lol --- src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt | 2 +- .../java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt index 3b5c3522..ce47be14 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt @@ -54,7 +54,7 @@ interface OgkUserDeckRepo : OngekiUserLinked { } interface OgkUserEventMusicRepo : OngekiUserLinked { - fun findByUserAndEventIdAndTypeAndMusicId( + fun findByUserAndEventIdAndTypeAndMusicIdAndLevel( userData: UserData, eventId: Int, type: Int, diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt index be5c51c4..dd4a3661 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUpsertAllApi.kt @@ -198,7 +198,7 @@ fun OngekiController.initUpsertAll() { // UserEventMusicList userEventMusicList?.let { list -> db.eventMusic.saveAll(list.distinctBy { it.eventId to it.type to it.musicId to it.level }.mapApply { - id = db.eventMusic.findByUserAndEventIdAndTypeAndMusicId(u, eventId, type, musicId, level)?.id ?: 0 + id = db.eventMusic.findByUserAndEventIdAndTypeAndMusicIdAndLevel(u, eventId, type, musicId, level)?.id ?: 0 }) } // UserTechEventList