From 0d0dc6b7fac5ce2ae9ccb51cf5ce440c8659fe82 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Mon, 14 Aug 2023 22:45:47 +0200
Subject: [PATCH] Fix lavasrc custom field serialization

---
 gradle/libs.versions.toml                                   | 4 ++--
 music/build.gradle.kts                                      | 2 +-
 .../kotlin/dev/schlaubi/mikmusic/util/VideoFormatter.kt     | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 16239f809..f8d65419e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ kord = "0.10.0-SNAPSHOT"
 jjwt = "0.11.5"
 api = "3.23.6"
 ksp = "1.9.0-1.0.11"
-lavakord = "feature-new-lavasrc-fields-SNAPSHOT"
+lavakord = "feature-new-lavasrc-fields-20230814.202530-2"
 
 [libraries]
 kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }
@@ -32,7 +32,7 @@ google-cloud-translate = { group = "com.google.cloud", name = "google-cloud-tran
 google-apis-youtube = { group = "com.google.apis", name = "google-api-services-youtube", version = "v3-rev20230521-2.0.0" }
 lavakord-kord = { group = "dev.schlaubi.lavakord", name = "kord", version.ref = "lavakord" }
 lavakord-sponsorblock = { group = "dev.schlaubi.lavakord", name = "sponsorblock", version.ref = "lavakord" }
-lavakord-lavsrc = { group = "dev.schlaubi.lavakord", name = "lavasrc", version.ref = "lavakord" }
+lavakord-lavsrc = { group = "dev.schlaubi.lavakord", name = "lavasrc-jvm", version.ref = "lavakord" }
 spotify = { group = "se.michaelthelin.spotify", name = "spotify-web-api-java", version = "8.0.0" }
 krontab = { group = "dev.inmo", name = "krontab", version = "0.10.0" }
 ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
index b5c5cc8df..03717a872 100644
--- a/music/build.gradle.kts
+++ b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.1.4-SNAPSHOT"
+    version = "3.1.5-SNAPSHOT"
 }
diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/util/VideoFormatter.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/util/VideoFormatter.kt
index 1bcb854d7..82dcabf9b 100644
--- a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/util/VideoFormatter.kt
+++ b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/util/VideoFormatter.kt
@@ -64,12 +64,14 @@ suspend fun EmbedBuilder.addSong(translate: Translator, track: Track) {
         }
     } else {
         author {
-            name = track.info.title
+            name = track.info.author
             if (lavaSrcInfo != null) {
                 if (lavaSrcInfo.artistUrl != null) {
                     url = lavaSrcInfo.artistUrl
                 }
-                icon = lavaSrcInfo.artistArtworkUrl
+                if(lavaSrcInfo.artistArtworkUrl != null) {
+                    icon = lavaSrcInfo.artistArtworkUrl
+                }
             }
         }
     }