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
DRSchlaubi · May 9, 2021 · 6981c27 · 6981c27
1 parent f0d9bc6
commit 6981c27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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<DiscordBotActivity>?,
+ val activities: List<DiscordBotActivity>,
  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
@@ -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)
 }