From 5c80aec50b3cdc689956e0a9687423968851d430 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sat, 28 Dec 2024 07:30:49 -0500
Subject: [PATCH] [F] Fix timezones

---
 src/main/java/ext/Ext.kt                               |  5 +++++
 .../java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt    | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ext/Ext.kt b/src/main/java/ext/Ext.kt
index 3378516a..8374216b 100644
--- a/src/main/java/ext/Ext.kt
+++ b/src/main/java/ext/Ext.kt
@@ -20,6 +20,8 @@ import java.nio.file.Path
 import java.security.MessageDigest
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.util.*
 import java.util.concurrent.locks.Lock
@@ -107,6 +109,8 @@ inline fun <reified T> resJson(name: Str, warn: Boolean = true) = resStr(name)?.
 } ?: run { if (warn) Ext.log.warn("Resource $name is not found"); null }
 
 // Date and time
+val JST_ZONE = ZoneId.of("Asia/Tokyo")
+fun jstNow() = LocalDateTime.now(JST_ZONE)
 fun millis() = System.currentTimeMillis()
 val DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd")
 fun LocalDate.isoDate() = format(DATE_FORMAT)
@@ -224,3 +228,4 @@ val <S> Pair<*, S>.r get() = component2()
 
 // Database
 val Query.exec get() = resultList.map { (it as Array<*>).toList() }
+
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt
index 3aad91d3..b22f73ec 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanApis.kt
@@ -8,7 +8,6 @@ import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney
 import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge
 import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail
 import icu.samnyan.aqua.sega.general.model.response.UserRecentRating
-import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 @Suppress("UNCHECKED_CAST")
@@ -193,6 +192,7 @@ val chusanInit: ChusanController.() -> Unit = {
         // Get the request url as te address
         val addr = (req.getHeader("wrapper original url") ?: req.requestURL.toString())
             .removeSuffix("GetGameSettingApi")
+        val now = jstNow()
 
         mapOf(
             "gameSetting" to mapOf(
@@ -200,14 +200,14 @@ val chusanInit: ChusanController.() -> Unit = {
                 "dataVersion" to versionHelper[data["clientId"].toString()],
                 "isMaintenance" to false,
                 "requestInterval" to 0,
-                "rebootStartTime" to LocalDateTime.now().minusHours(3).format(fmt),
-                "rebootEndTime" to LocalDateTime.now().minusHours(2).format(fmt),
+                "rebootStartTime" to now.minusHours(4).format(fmt),
+                "rebootEndTime" to now.minusHours(3).format(fmt),
                 "isBackgroundDistribute" to false,
                 "maxCountCharacter" to 300,
                 "maxCountItem" to 300,
                 "maxCountMusic" to 300,
-                "matchStartTime" to LocalDateTime.now().minusHours(5).format(fmt),
-                "matchEndTime" to LocalDateTime.now().plusHours(5).format(fmt),
+                "matchStartTime" to now.minusHours(1).format(fmt),
+                "matchEndTime" to now.plusHours(7).format(fmt),
                 "matchTimeLimit" to 10,
                 "matchErrorLimit" to 10,
                 "matchingUri" to addr,