From 1f45a80c4dcfcfb4c5223dbb1a6ee193df937fe7 Mon Sep 17 00:00:00 2001 From: Dom Eori <4j6dq2zi8@relay.firefox.com> Date: Sat, 9 Apr 2022 22:24:47 +0900 Subject: [PATCH] [chusan] Fix UserNameEx related issue --- .../sega/game/chuni/v2/ApiChuniV2PlayerDataController.java | 1 - .../aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java | 2 +- .../aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java index 47390b25..fb1dca47 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java @@ -110,7 +110,6 @@ public class ApiChuniV2PlayerDataController { public UserData updateName(@RequestBody Map request) { UserData profile = userDataService.getUserByExtId((String) request.get("aimeId")).orElseThrow(); profile.setUserName((String) request.get("userName")); - profile.setUserNameEx((String) request.get("userName")); return userDataService.saveUserData(profile); } diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java index fd3e7a9b..d20fa38a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java @@ -90,7 +90,7 @@ public class GetUserPreviewHandler implements BaseHandler { }); resp.setChargeState(1); - resp.setUserNameEx(user.getUserName()); + resp.setUserNameEx(""); resp.setBanState(0); resp.setClassEmblemMedal(user.getClassEmblemMedal()); resp.setClassEmblemBase(user.getClassEmblemBase()); diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java index 406ff3fe..2cad6f80 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java @@ -92,13 +92,12 @@ public class UpsertUserAllHandler implements BaseHandler { newUserData.setId(userData.getId()); newUserData.setCard(userData.getCard()); - // Decode Username String userName = new String(newUserData.getUserName() .getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8); - newUserData.setUserName(userName); + newUserData.setUserNameEx(""); userDataService.saveAndFlushUserData(newUserData); }