Add lavasearch support

DRSchlaubi · Nov 30, 2023 · 5b57b3e · 5b57b3e
1 parent 41715d4
commit 5b57b3e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 6 deletions.
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,6 +7,9 @@ plugins {
 
 subprojects {
     addRepositories()
+    repositories {
+        maven("https://maven.topi.wtf/releases")
+    }
 }
 
 mikbotPlugin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ kord = "0.12.0"
 jjwt = "0.11.5"
 api = "3.26.0"
 ksp = "2.0.0-Beta1-1.0.14"
-lavakord = "feature-new-lavasrc-fields-20230814.202530-2"
+lavakord = "main-SNAPSHOT"
 
 [libraries]
 kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }
@@ -33,6 +33,7 @@ google-apis-youtube = { group = "com.google.apis", name = "google-api-services-y
 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-jvm", version.ref = "lavakord" }
+lavakord-lavasearch = { group = "dev.schlaubi.lavakord", name = "lavasearch-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
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.3.0-SNAPSHOT"
+    version = "3.4.0-SNAPSHOT"
 }
diff --git a/music/player/build.gradle.kts b/music/player/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
     api(libs.lavakord.kord)
     api(libs.lavakord.sponsorblock)
     api(libs.lavakord.lavsrc)
+    api(libs.lavakord.lavasearch)
 
     // Plattform support
     implementation(libs.google.apis.youtube)

diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/autocomplete/AutoCompleteArgument.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/autocomplete/AutoCompleteArgument.kt
@@ -1,11 +1,20 @@
 package dev.schlaubi.mikmusic.autocomplete
 
+import com.kotlindiscord.kord.extensions.ExtensibleBot
 import com.kotlindiscord.kord.extensions.commands.Arguments
 import com.kotlindiscord.kord.extensions.commands.converters.SingleConverter
 import com.kotlindiscord.kord.extensions.commands.converters.impl.string
-import dev.kord.common.Locale
+import com.kotlindiscord.kord.extensions.koin.KordExContext
 import dev.kord.core.behavior.interaction.suggestString
-import dev.schlaubi.mikmusic.innerttube.requestYouTubeAutoComplete
+import dev.kord.core.event.interaction.GuildAutoCompleteInteractionCreateEvent
+import dev.kord.x.emoji.Emojis
+import dev.schlaubi.lavakord.plugins.lavasearch.rest.search
+import dev.schlaubi.lavakord.plugins.lavasrc.lavaSrcInfo
+import dev.schlaubi.mikmusic.core.Config
+import dev.schlaubi.mikmusic.core.MusicModule
+
+private val musicModule = KordExContext.get().get<ExtensibleBot>()
+    .findExtensions<MusicModule>().first()
 
 /**
  * Creates a `query` argument with [description] supporting YouTube Auto-complete.
@@ -18,9 +27,27 @@ fun Arguments.autoCompletedYouTubeQuery(description: String): SingleConverter<St
         val input = focusedOption.value
 
         if (input.isNotBlank()) {
-            val youtubeResult = requestYouTubeAutoComplete(input, locale ?: Locale.ENGLISH_UNITED_STATES)
+            val result = musicModule
+                .getMusicPlayer((it as GuildAutoCompleteInteractionCreateEvent).interaction.guild)
+                .search("${Config.DEFAULT_SEARCH_PROVIDER}:$input")
+
             suggestString {
-                youtubeResult.take(25).forEach { choice(it, it) }
+                result.texts.take(5).map { (text) ->
+                    choice(text, text)
+                }
+                result.artists.take(5).forEach { playlist ->
+                    choice("${Emojis.man} ${playlist.info.name}", playlist.lavaSrcInfo.url)
+                }
+                result.tracks.take(5).forEach { track ->
+                    val uri = track.info.uri ?: return@forEach
+                    choice("${Emojis.notes} ${track.info.title}", uri)
+                }
+                result.albums.take(5).forEach { playlist ->
+                    choice("${Emojis.cd} ${playlist.info.name}", playlist.lavaSrcInfo.url)
+                }
+                result.playlists.take(5).forEach { playlist ->
+                    choice("${Emojis.scroll} ${playlist.info.name}", playlist.lavaSrcInfo.url)
+                }
             }
         }
     }