From f33e1a0ae0069c434f607b8e44fc23e5ac8c6c7e Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 18 Jan 2025 22:03:07 -0500 Subject: [PATCH] [F] Fix dates and timezones --- src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt index b55d7c0d..c555424b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt @@ -193,8 +193,8 @@ fun Maimai2ServletController.initApis() { val phases = mapOf(1 to 1, 2 to 7, 3 to 14, 4 to 21) // Find the minimum phase id that started prior to today. fun findPhase(baseDate: LocalDate): Int { - val today = LocalDate.now() - return phases.entries.find { baseDate.plusDays(it.value.toLong()) >= today }?.key ?: 5 + val today = jstNow().toLocalDate() + return phases.entries.find { baseDate.plusDays(it.value.toLong()) > today }?.key ?: 5 } // Kaleidoscope, added on 1.50