From 34aae0c87a92ecd7f50540e5cd3f73344bdab9d8 Mon Sep 17 00:00:00 2001 From: Menci Date: Tue, 21 Oct 2025 02:46:43 +0800 Subject: [PATCH] [F] Player name validation (#186) --- src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt | 4 ++-- src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt | 2 +- src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt | 2 +- src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt b/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt index 7bed80c0..59e64270 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/GameHelper.kt @@ -8,10 +8,10 @@ import java.time.LocalDate const val LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789" -const val SYMBOLS = "・:;?!~/+-×÷=♂♀∀#&*@☆○◎◇□△▽♪†‡ΣαβγθφψωДё$()._␣" +const val SYMBOLS = "・:;?!~/+-×÷=♂♀∀#&*@☆○◎◇□△▽♪†‡ΣαβγθφψωДё$()._ " const val KANA = "あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをん" + "アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲン" -const val SEGA_USERNAME_CAHRS = LETTERS + SYMBOLS + KANA +const val SEGA_USERNAME_CHARS = LETTERS + SYMBOLS + KANA const val WACCA_USERNAME_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789" + diff --git a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt index 16bfb6f1..97c9f2a5 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt @@ -25,7 +25,7 @@ class Chusan( // Only show > AAA rank override val shownRanks = chu3Scores.filter { it.first >= 95 * 10000 } override val settableFields: Map Unit> by lazy { mapOf( - "userName" to usernameCheck(SEGA_USERNAME_CAHRS), + "userName" to usernameCheck(SEGA_USERNAME_CHARS), "nameplateId" to { u, v -> u.nameplateId = v.int }, "frameId" to { u, v -> u.frameId = v.int }, "trophyId" to { u, v -> u.trophyId = v.int }, diff --git a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt index 49cec172..1ef5d6c1 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt @@ -29,7 +29,7 @@ class Maimai2( // Only show > S rank override val shownRanks = mai2Scores.filter { it.first >= 97 * 10000 } override val settableFields: Map Unit> by lazy { mapOf( - "userName" to usernameCheck(SEGA_USERNAME_CAHRS), + "userName" to usernameCheck(SEGA_USERNAME_CHARS), "iconId" to { u, v -> u.iconId = v.int() }, "plateId" to { u, v -> u.plateId = v.int() }, "titleId" to { u, v -> u.titleId = v.int() }, diff --git a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt index 8e22cb2f..630dc1e1 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt @@ -27,7 +27,7 @@ class Ongeki( override val shownRanks = ongekiScores.filter { it.first >= 950000 } override val settableFields: Map Unit> by lazy { mapOf( - "userName" to usernameCheck(SEGA_USERNAME_CAHRS), + "userName" to usernameCheck(SEGA_USERNAME_CHARS), "lastRomVersion" to { u, v -> u.lastRomVersion = v }, "lastDataVersion" to { u, v -> u.lastDataVersion = v },