From caba213e9d9bb96cfc13d6a6f081af4c1231ee39 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Sat, 18 Jan 2025 06:24:59 +0800
Subject: [PATCH 1/2] [+] Allow disable music rank for own machine

---
 AquaNet/src/components/settings/Mai2Settings.svelte      | 2 ++
 AquaNet/src/libs/i18n/en_ref.ts                          | 2 ++
 AquaNet/src/libs/i18n/zh.ts                              | 2 ++
 src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt | 3 +++
 .../aqua/sega/maimai2/handler/GetGameRankingHandler.kt   | 9 ++++++++-
 .../db/V1000_35__maimai2_optional_music_rank.sql         | 1 +
 6 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/db/V1000_35__maimai2_optional_music_rank.sql

diff --git a/AquaNet/src/components/settings/Mai2Settings.svelte b/AquaNet/src/components/settings/Mai2Settings.svelte
index 544b2ce8..a664111d 100644
--- a/AquaNet/src/components/settings/Mai2Settings.svelte
+++ b/AquaNet/src/components/settings/Mai2Settings.svelte
@@ -5,6 +5,7 @@
   import Icon from "@iconify/svelte";
   import StatusOverlays from "../StatusOverlays.svelte";
   import { GAME } from "../../libs/sdk";
+  import GameSettingFields from "./GameSettingFields.svelte";
 
   const profileFields = [
     ['name', t('settings.mai2.name')],
@@ -72,6 +73,7 @@
       </div>
     </div>
   {/each}
+  <GameSettingFields game="mai2"/>
   <button class="exportButton" on:click={exportData}>
     <Icon icon="bxs:file-export"/>
     {t('settings.export')}
diff --git a/AquaNet/src/libs/i18n/en_ref.ts b/AquaNet/src/libs/i18n/en_ref.ts
index 1ba08c52..80dc168a 100644
--- a/AquaNet/src/libs/i18n/en_ref.ts
+++ b/AquaNet/src/libs/i18n/en_ref.ts
@@ -153,6 +153,8 @@ export const EN_REF_SETTINGS = {
   'settings.fields.gameUsername.desc': 'Your name shown in game',
   'settings.fields.optOutOfLeaderboard.name': 'Opt Out of Leaderboard',
   'settings.fields.optOutOfLeaderboard.desc': 'You will still be able to see yourself on the leaderboard after logging in',
+  'settings.fields.enableMusicRank.name': 'Enable Recommended Music Rank on Your Machine',
+  'settings.fields.enableMusicRank.desc': 'If you have your own ranking, you can turn this off. It only affects your own machine',
   'settings.mai2.name': 'Player Name',
   'settings.profile.picture': 'Profile Picture',
   'settings.profile.upload-new': 'Upload New',
diff --git a/AquaNet/src/libs/i18n/zh.ts b/AquaNet/src/libs/i18n/zh.ts
index 6b32662c..1c65ae8e 100644
--- a/AquaNet/src/libs/i18n/zh.ts
+++ b/AquaNet/src/libs/i18n/zh.ts
@@ -163,6 +163,8 @@ const zhSettings: typeof EN_REF_SETTINGS = {
   'settings.fields.gameUsername.desc': '在游戏中显示的用户名',
   'settings.fields.optOutOfLeaderboard.name': '不参与排行榜',
   'settings.fields.optOutOfLeaderboard.desc': '登录之后还是可以在排行榜上看到自己',
+  'settings.fields.enableMusicRank.name': '在你的机台上启用“推荐乐曲排行榜”',
+  'settings.fields.enableMusicRank.desc': '如果你自己设计了排行榜的话，可以关闭这个。只会影响你自己的机器',
   'settings.mai2.name': '玩家名字',
   'settings.profile.picture': '头像',
   'settings.profile.upload-new': '上传',
diff --git a/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt b/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
index 7e7022e1..8502020d 100644
--- a/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
+++ b/src/main/java/icu/samnyan/aqua/net/db/AquaGameOptions.kt
@@ -43,6 +43,9 @@ class AquaGameOptions(
 
     @SettingField("chu3-matching")
     var chusanMatchingReflector: String = "",
+
+    @SettingField("mai2")
+    var enableMusicRank: Boolean = true,
 )
 
 interface AquaGameOptionsRepo : JpaRepository<AquaGameOptions, Long>
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
index 5eb5de14..4e0f4f3a 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
@@ -3,6 +3,7 @@ package icu.samnyan.aqua.sega.maimai2.handler
 import com.querydsl.jpa.impl.JPAQueryFactory
 import ext.logger
 import ext.thread
+import icu.samnyan.aqua.sega.allnet.TokenChecker
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.maimai2.model.userdata.QMai2UserPlaylog
 import org.springframework.scheduling.annotation.Scheduled
@@ -55,7 +56,13 @@ class GetGameRankingHandler(
     override fun handle(request: Map<String, Any>): Any = mapOf(
         "type" to request["type"],
         "gameRankingList" to when(request["type"]) {
-            1 -> musicRankingCache.map { mapOf("id" to it.musicId, "point" to it.weight, "userName" to "") }
+            1 -> {
+                val opts = TokenChecker.getCurrentSession()?.user?.gameOptions
+                if (opts?.enableMusicRank != true)
+                    emptyList()
+                else
+                    musicRankingCache.map { mapOf("id" to it.musicId, "point" to it.weight, "userName" to "") }
+            }
             else -> emptyList()
         }
     )
diff --git a/src/main/resources/db/V1000_35__maimai2_optional_music_rank.sql b/src/main/resources/db/V1000_35__maimai2_optional_music_rank.sql
new file mode 100644
index 00000000..be8822fc
--- /dev/null
+++ b/src/main/resources/db/V1000_35__maimai2_optional_music_rank.sql
@@ -0,0 +1 @@
+ALTER TABLE aqua_game_options ADD enable_music_rank BIT(1) NOT NULL DEFAULT 1;

From 2a23f643af7e9abb0290c8d75206c8cf16f1f653 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Sat, 18 Jan 2025 06:38:09 +0800
Subject: [PATCH 2/2] fix

---
 .../samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
index 4e0f4f3a..919e1c80 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.kt
@@ -58,7 +58,8 @@ class GetGameRankingHandler(
         "gameRankingList" to when(request["type"]) {
             1 -> {
                 val opts = TokenChecker.getCurrentSession()?.user?.gameOptions
-                if (opts?.enableMusicRank != true)
+                // If is null or true, return the ranking list
+                if (opts?.enableMusicRank == false)
                     emptyList()
                 else
                     musicRankingCache.map { mapOf("id" to it.musicId, "point" to it.weight, "userName" to "") }