Show new LavaSrc fields in song embeds

DRSchlaubi · Aug 14, 2023 · 7b50e5a · 7b50e5a
1 parent 6308233
commit 7b50e5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git 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.5"
 ksp = "1.9.0-1.0.11"
-lavakord = "5.1.6"
+lavakord = "feature-new-lavasrc-fields-SNAPSHOT"
 
 [libraries]
 kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }

diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.1.3-SNAPSHOT"
+    version = "3.1.4-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
@@ -6,6 +6,7 @@ import dev.arbjerg.lavalink.protocol.v4.Track
 import dev.kord.common.Color
 import dev.kord.rest.builder.message.EmbedBuilder
 import dev.nycode.imagecolor.ImageColorClient
+import dev.schlaubi.lavakord.plugins.lavasrc.lavaSrcInfo
 import dev.schlaubi.mikbot.plugin.api.util.Translator
 import dev.schlaubi.mikmusic.core.Config
 import kotlin.time.DurationUnit
@@ -51,6 +52,7 @@ suspend fun EmbedBuilder.addSong(translate: Translator, track: Track) {
     }
 
     val video = track.findOnYoutube()
+    val lavaSrcInfo = runCatching { track.lavaSrcInfo }.getOrNull()
     if (video != null) {
         val info = video.snippet
         val channel = getFirstChannelById(info.channelId).snippet
@@ -61,9 +63,14 @@ suspend fun EmbedBuilder.addSong(translate: Translator, track: Track) {
             icon = channel.thumbnails.high.url
         }
     } else {
-        field {
-            name = translate("music.track.author", "music")
-            value = track.info.author
+        author {
+            name = track.info.title
+            if (lavaSrcInfo != null) {
+                if (lavaSrcInfo.artistUrl != null) {
+                    url = lavaSrcInfo.artistUrl
+                }
+                icon = lavaSrcInfo.artistArtworkUrl
+            }
         }
     }
 }