From 6981c273685e4486a35399cc75cb80550a251c02 Mon Sep 17 00:00:00 2001 From: Bart Arys Date: Mon, 3 May 2021 18:11:54 +0200 Subject: [PATCH] Port kotlinx.serialization to 1.2.0 - Convert local classes to top level classes (See Kotlin/kotlinx.serialization#1472) - Improve handling of empty JSON bodies (See Kotlin/kotlinx.serialization#678) - Fix Failing Command test --- gateway/src/main/kotlin/Command.kt | 2 +- gateway/src/main/kotlin/builder/PresenceBuilder.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gateway/src/main/kotlin/Command.kt b/gateway/src/main/kotlin/Command.kt index 8d3867b1fd69..90f228e991c2 100644 --- a/gateway/src/main/kotlin/Command.kt +++ b/gateway/src/main/kotlin/Command.kt @@ -196,7 +196,7 @@ data class UpdateVoiceStatus( @Serializable data class UpdateStatus( val since: Long?, - val activities: List?, + val activities: List, val status: PresenceStatus, val afk: Boolean, ) : Command() diff --git a/gateway/src/main/kotlin/builder/PresenceBuilder.kt b/gateway/src/main/kotlin/builder/PresenceBuilder.kt index 63d259cf8cec..bcf66338f43d 100644 --- a/gateway/src/main/kotlin/builder/PresenceBuilder.kt +++ b/gateway/src/main/kotlin/builder/PresenceBuilder.kt @@ -36,7 +36,7 @@ class PresenceBuilder { game = DiscordBotActivity(name, ActivityType.Competing) } - fun toUpdateStatus(): UpdateStatus = UpdateStatus(since?.toEpochMilli(), game?.let(::listOf), status, afk) + fun toUpdateStatus(): UpdateStatus = UpdateStatus(since?.toEpochMilli(), game?.let(::listOf).orEmpty(), status, afk) fun toPresence(): DiscordPresence = DiscordPresence(status, afk, since?.toEpochMilli(), game) } \ No newline at end of file