From 5be6d8c80b0a1754081770c97bd293ab4bfaa265 Mon Sep 17 00:00:00 2001
From: Raymond <101374892+raymonable@users.noreply.github.com>
Date: Sat, 6 Jun 2026 23:07:27 -0400
Subject: [PATCH] fix: [ongeki] fix field matching in importer

---
 .../java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt | 7 +++++--
 src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt  | 4 ++--
 .../java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt b/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
index a94a5616..92a55003 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
@@ -26,7 +26,10 @@ class OngekiImport(
         .filter { f -> f.name !in setOf("gameId", "userData") }
         .associateWith { OngekiUserRepos::class.declaredMembers
             .filter { f -> f returns OngekiUserLinked::class }
-            .firstOrNull { f -> f.name == it.name || f.name == it.name.replace("List", "") }
+            .firstOrNull { f -> f.name == it.name
+                || f.name == (it.name.substring(4, 5).lowercase() + it.name.substring(5)) // strip user
+                || f.name == it.name.replace("List", "")
+            }
             ?.call(repos) as OngekiUserLinked<*>? ?: error("No matching field found for ${it.name}")
         },
     artemisRenames = mapOf() // TODO (almost nobody uses this so it's very low priority)
@@ -57,7 +60,7 @@ data class OngekiDataExport(
     var userMusicItem: List<UserMusicItem>,
     var userOption: UserOption,
     var userPlaylog: List<UserPlaylog>,
-    var userRivalData: List<UserRival>,
+    var userRival: List<UserRival>,
     var userScenario: List<UserScenario>,
     var userStory: List<UserStory>,
     var userTechCount: List<UserTechCount>,
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 97202479..e1714871 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt
@@ -111,7 +111,7 @@ interface OgkUserOptionRepo : OngekiUserLinked<UserOption>
 
 interface OgkUserPlaylogRepo : OngekiUserLinked<UserPlaylog>, GenericPlaylogRepo<UserPlaylog>
 
-interface OgkUserRivalDataRepo : OngekiUserLinked<UserRival>
+interface OgkUserRivalRepo : OngekiUserLinked<UserRival>
 
 interface OgkUserScenarioRepo : OngekiUserLinked<UserScenario> {
     fun findByUserAndScenarioId(user: UserData, scenarioId: Int): UserScenario?
@@ -187,7 +187,7 @@ class OngekiUserRepos(
     val musicItem: OgkUserMusicItemRepo,
     val option: OgkUserOptionRepo,
     val playlog: OgkUserPlaylogRepo,
-    val rivalData: OgkUserRivalDataRepo,
+    val rival: OgkUserRivalRepo,
     val scenario: OgkUserScenarioRepo,
     val story: OgkUserStoryRepo,
     val techCount: OgkUserTechCountRepo,
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
index 59fb88b0..ffef4f40 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiUserApis.kt
@@ -32,7 +32,7 @@ fun OngekiController.initUser() {
     "GetUserLoginBonus".unpaged { db.loginBonus.findByUser_Card_ExtId(uid) }
     "GetUserMissionPoint".unpaged { db.missionPoint.findByUser_Card_ExtId(uid) }
     "GetUserMusicItem".unpaged { db.musicItem.findByUser_Card_ExtId(uid) }
-    "GetUserRival".unpaged { db.rivalData.findByUser_Card_ExtId(uid) }
+    "GetUserRival".unpaged { db.rival.findByUser_Card_ExtId(uid) }
     "GetUserScenario".unpaged { db.scenario.findByUser_Card_ExtId(uid) }
     "GetUserSkin".unpaged { db.skin.findByUser_Card_ExtId(uid) }
     "GetUserStory".unpaged { db.story.findByUser_Card_ExtId(uid) }