Skip to content

Commit 43ee008

Browse files
topi314DRSchlaubi
authored andcommitted
always include plugin info & user data when serializing (lavalink-devs#1008)
1 parent 05363bf commit 43ee008

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/loadResult.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
package dev.arbjerg.lavalink.protocol.v4
44

55
import dev.arbjerg.lavalink.protocol.v4.serialization.asPolymorphicDeserializer
6-
import kotlinx.serialization.DeserializationStrategy
7-
import kotlinx.serialization.KSerializer
8-
import kotlinx.serialization.SerialName
9-
import kotlinx.serialization.Serializable
6+
import kotlinx.serialization.*
107
import kotlinx.serialization.builtins.ListSerializer
118
import kotlinx.serialization.descriptors.SerialDescriptor
129
import kotlinx.serialization.encoding.Decoder
@@ -133,6 +130,7 @@ data class PlaylistInfo(
133130
@Serializable
134131
data class Playlist(
135132
val info: PlaylistInfo,
133+
@EncodeDefault
136134
val pluginInfo: JsonObject = JsonObject(emptyMap()),
137135
val tracks: List<Track>
138136
) : LoadResult.Data {

protocol/src/commonMain/kotlin/dev/arbjerg/lavalink/protocol/v4/player.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package dev.arbjerg.lavalink.protocol.v4
22

3-
import kotlinx.serialization.DeserializationStrategy
4-
import kotlinx.serialization.Serializable
3+
import kotlinx.serialization.*
4+
import kotlinx.serialization.json.JsonNames
55
import kotlinx.serialization.json.JsonObject
6-
import kotlinx.serialization.serializer
76
import kotlin.jvm.JvmInline
87

98
inline fun <reified T> JsonObject.deserialize(): T =
@@ -31,7 +30,9 @@ data class Player(
3130
data class Track(
3231
val encoded: String,
3332
val info: TrackInfo,
33+
@EncodeDefault
3434
val pluginInfo: JsonObject = JsonObject(emptyMap()),
35+
@EncodeDefault
3536
val userData: JsonObject = JsonObject(emptyMap())
3637
) : LoadResult.Data {
3738

0 commit comments

Comments
 (0)