From 1dccfd2deff3c5de6a6cf2156cac8516b40bdd22 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 1 Feb 2024 03:52:44 +0100 Subject: [PATCH] fix: Serialize response correctly --- .../app/revanced/api/backend/github/GitHubBackend.kt | 8 ++++---- .../app/revanced/api/backend/github/api/ResponseSchema.kt | 5 ++--- src/main/kotlin/app/revanced/api/modules/Routing.kt | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/app/revanced/api/backend/github/GitHubBackend.kt b/src/main/kotlin/app/revanced/api/backend/github/GitHubBackend.kt index 10dcfda..49d4c32 100644 --- a/src/main/kotlin/app/revanced/api/backend/github/GitHubBackend.kt +++ b/src/main/kotlin/app/revanced/api/backend/github/GitHubBackend.kt @@ -23,6 +23,8 @@ import app.revanced.api.backend.github.api.Response.GitHubOrganization.GitHubMem import io.ktor.client.plugins.resources.Resources import io.ktor.serialization.kotlinx.json.* import kotlinx.coroutines.* +import kotlinx.datetime.TimeZone +import kotlinx.datetime.toLocalDateTime import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonNamingStrategy @@ -71,11 +73,9 @@ class GitHubBackend(token: String? = null) : Backend({ return BackendRelease( tag = release.tagName, releaseNote = release.body, - createdAt = release.createdAt, + createdAt = release.createdAt.toLocalDateTime(TimeZone.UTC), assets = release.assets.map { - BackendAsset( - downloadUrl = it.browserDownloadUrl - ) + BackendAsset(downloadUrl = it.browserDownloadUrl) }.toSet() ) } diff --git a/src/main/kotlin/app/revanced/api/backend/github/api/ResponseSchema.kt b/src/main/kotlin/app/revanced/api/backend/github/api/ResponseSchema.kt index 9fe86ab..fbfd89a 100644 --- a/src/main/kotlin/app/revanced/api/backend/github/api/ResponseSchema.kt +++ b/src/main/kotlin/app/revanced/api/backend/github/api/ResponseSchema.kt @@ -1,7 +1,6 @@ package app.revanced.api.backend.github.api -import kotlinx.datetime.LocalDateTime -import kotlinx.serialization.SerialName +import kotlinx.datetime.Instant import kotlinx.serialization.Serializable @@ -41,7 +40,7 @@ class Response { class GitHubRelease( val tagName: String, val assets: Set, - val createdAt: LocalDateTime, + val createdAt: Instant, val body: String ) { @Serializable diff --git a/src/main/kotlin/app/revanced/api/modules/Routing.kt b/src/main/kotlin/app/revanced/api/modules/Routing.kt index b5fdfaf..f39d7e7 100644 --- a/src/main/kotlin/app/revanced/api/modules/Routing.kt +++ b/src/main/kotlin/app/revanced/api/modules/Routing.kt @@ -12,8 +12,6 @@ import io.ktor.server.routing.* import io.ktor.util.pipeline.* import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll -import kotlinx.datetime.toKotlinLocalDateTime -import java.time.LocalDateTime import org.koin.ktor.ext.get as koinGet fun Application.configureRouting() {