From af6820d1bf81f19adfaa877041555fa56de40b58 Mon Sep 17 00:00:00 2001 From: akastijn Date: Sat, 18 Jul 2026 21:04:54 +0200 Subject: [PATCH] Remove custom OffsetDateTime mappings in OpenAPI config and ensure timestamps are converted to UTC in ChatLog. --- api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java | 3 ++- web-api/build.gradle.kts | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java b/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java index 6c739f1..fbe5d1c 100644 --- a/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java +++ b/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java @@ -12,6 +12,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; import java.time.Instant; +import java.time.ZoneOffset; import java.util.UUID; @AllArgsConstructor @@ -49,7 +50,7 @@ public class ChatLog implements BatchInsertable { chatMessageDto.setMessage(GsonComponentSerializer.gson().serialize(miniMessage)); chatMessageDto.setChannel(ChatMessageDto.ChannelEnum.CHAT); chatMessageDto.setServer(server); - chatMessageDto.setTimestamp(timestamp); + chatMessageDto.setTimestamp(timestamp.atOffset(ZoneOffset.UTC)); chatMessageDto.setUuid(uuid); chatMessageDto.setBlocked(blocked); return chatMessageDto; diff --git a/web-api/build.gradle.kts b/web-api/build.gradle.kts index e6c5707..3e5e0cb 100644 --- a/web-api/build.gradle.kts +++ b/web-api/build.gradle.kts @@ -45,9 +45,6 @@ tasks.named("openAp ) ) - typeMappings.set(mapOf("OffsetDateTime" to "Instant")) - importMappings.set(mapOf("OffsetDateTime" to "java.time.Instant")) - generateApiTests.set(false) generateApiDocumentation.set(false) generateModelTests.set(false)