From 506031b5cbbe287278e0015e4627984e8d320118 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Thu, 26 Dec 2024 20:15:41 -0500
Subject: [PATCH] [F] Fix team name null

---
 .../icu/samnyan/aqua/sega/chusan/ChusanServletController.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
index 84899e56..b31ac399 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanServletController.kt
@@ -290,8 +290,8 @@ fun ChusanServletController.init() {
 
     "GetUserTeam" {
         val playDate = parsing { data["playDate"] as String }
-        val team = db.userData.findByCard_ExtId(uid)()?.card?.aquaUser?.gameOptions?.chusanTeamName
-            ?: props.teamName ?:  "一緒に歌おう！"
+        val team = db.userData.findByCard_ExtId(uid)()?.card?.aquaUser?.gameOptions?.chusanTeamName?.ifBlank { null }
+            ?: props.teamName?.ifBlank { null } ?:  "一緒に歌おう！"
         val teamStr = String(team.toByteArray(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)
 
         mapOf(