Fix serialization problems

See https://youtrack.jetbrains.com/issue/KT-55681
DRSchlaubi · Jan 9, 2023 · ada5a2d · ada5a2d
1 parent 0d0fc9e
commit ada5a2d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/game/multiple-choice-game/build.gradle.kts b/game/multiple-choice-game/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.schlaubi.mikbot"
-version = "2.8.0"
+version = "2.8.1"
 
 dependencies {
     plugin(projects.game.gameApi)

diff --git a/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/InnerTubeBox.kt b/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/InnerTubeBox.kt
@@ -3,7 +3,7 @@ package dev.schlaubi.mikmusic.innerttube
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class InnerTubeBox<T>(val contents: List<T> = emptyList()) : List<T> by contents
+data class InnerTubeBox<T>(val contents: List<T> = emptyList())
 
 
 @Serializable

diff --git a/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/YouTubeUtil.kt b/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/YouTubeUtil.kt
@@ -11,7 +11,7 @@ private const val timeSeparator = ':'
 suspend fun requestYouTubeAutoComplete(query: String, locale: Locale): List<String> {
     val response = InnerTubeClient.requestMusicAutoComplete(query, locale)
 
-    return response.firstOrNull()?.searchSuggestionsSectionRenderer?.mapNotNull {
+    return response.contents.firstOrNull()?.searchSuggestionsSectionRenderer?.contents?.mapNotNull {
         it.searchSuggestionRenderer?.suggestion?.joinRuns()
     } ?: emptyList()
 }

diff --git a/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/autoplay.kt b/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/autoplay.kt
@@ -88,7 +88,7 @@ data class PlaylistPanelVideoRenderer(
 }
 
 @Serializable
-data class Text(val text: String) : CharSequence by text {
+data class Text(val text: String) {
     override fun toString(): String = text
 }
 

diff --git a/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/chapters.kt b/music/src/main/kotlin/dev/schlaubi/mikmusic/innerttube/chapters.kt
@@ -34,7 +34,7 @@ data class MacroMarkersListItemRenderer(
 )
 
 @Serializable
-data class TextBlock(val simpleText: String): CharSequence by simpleText {
+data class TextBlock(val simpleText: String) {
     override fun toString(): String = simpleText
 }