allow for deserialization of plugin info into data classes

lavalink-devs · Oct 12, 2023 · 9928977 · 9928977
1 parent 8df70c2
commit 9928977
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/LavalinkServer/src/main/java/lavalink/server/util/util.kt b/LavalinkServer/src/main/java/lavalink/server/util/util.kt
@@ -54,7 +54,7 @@ fun AudioTrack.toTrack(encoded: String, pluginInfoModifiers: List<AudioPluginInf
         acc + jsonObject
     }
 
-    return Track(encoded, this.toInfo(), pluginInfo)
+    return Track(encoded, this.toInfo(), PluginData(pluginInfo))
 }
 
 private operator fun JsonObject.plus(other: JsonObject) = JsonObject(toMap() + other.toMap())
@@ -80,12 +80,12 @@ fun AudioPlaylist.toPlaylistInfo(): PlaylistInfo {
 }
 
 
-fun AudioPlaylist.toPluginInfo(pluginInfoModifiers: List<AudioPluginInfoModifier>): JsonObject {
+fun AudioPlaylist.toPluginInfo(pluginInfoModifiers: List<AudioPluginInfoModifier>): PluginData {
     val pluginInfo = pluginInfoModifiers.fold(JsonObject(emptyMap())) { acc, it ->
         val jsonObject = it.modifyAudioPlaylistPluginInfo(this) ?: JsonObject(emptyMap())
         acc + jsonObject
     }
-    return pluginInfo
+    return PluginData(pluginInfo)
 }
 
 fun LavalinkPlayer.toPlayer(context: SocketContext, pluginInfoModifiers: List<AudioPluginInfoModifier>): Player {

diff --git a/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/loadResult.kt b/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/loadResult.kt
@@ -96,7 +96,7 @@ sealed interface LoadResult {
     companion object {
         fun trackLoaded(track: Track) = TrackLoaded(track)
 
-        fun playlistLoaded(playlistInfo: PlaylistInfo, pluginInfo: JsonObject, tracks: List<Track>) =
+        fun playlistLoaded(playlistInfo: PlaylistInfo, pluginInfo: PluginData, tracks: List<Track>) =
             PlaylistLoaded(
                 Playlist(
                     playlistInfo,
@@ -133,7 +133,7 @@ data class PlaylistInfo(
 @Serializable
 data class Playlist(
     val info: PlaylistInfo,
-    val pluginInfo: JsonObject,
+    val pluginInfo: PluginData,
     val tracks: List<Track>
 ) : LoadResult.Data
 

diff --git a/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt b/protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt
@@ -1,10 +1,19 @@
 package dev.arbjerg.lavalink.protocol.v4
 
+import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.serializer
 import kotlin.jvm.JvmInline
 
-@Serializable()
+@Serializable
+@JvmInline
+value class PluginData(private val obj: JsonObject){
+    inline fun <reified T> deserialize(): T = deserialize(json.serializersModule.serializer<T>())
+    fun <T> deserialize(deserializer: DeserializationStrategy<T>): T = json.decodeFromJsonElement(deserializer, obj)
+}
+
+@Serializable
 @JvmInline
 value class Players(val players: List<Player>)
 
@@ -23,7 +32,7 @@ data class Player(
 data class Track(
     val encoded: String,
     val info: TrackInfo,
-    val pluginInfo: JsonObject
+    val pluginInfo: PluginData
 ) : LoadResult.Data
 
 @Serializable