Make search provider configurable

DRSchlaubi · Aug 1, 2023 · 27fbe93 · 27fbe93
1 parent 196ebc4
commit 27fbe93
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.0.5-SNAPSHOT"
+    version = "3.0.6-SNAPSHOT"
 }
diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/Config.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/core/Config.kt
@@ -9,4 +9,5 @@ object Config : EnvironmentConfig("") {
     val SPOTIFY_CLIENT_ID by getEnv("")
     val SPOTIFY_CLIENT_SECRET by getEnv("")
     val IMAGE_COLOR_SERVICE_URL by environment.optional()
+    val DEFAULT_SEARCH_PROVIDER by getEnv("ytsearch")
 }
diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/musicchannel/MusicInteractionModule.kt
@@ -18,6 +18,7 @@ import dev.schlaubi.mikbot.plugin.api.module.MikBotModule
 import dev.schlaubi.mikbot.plugin.api.util.*
 import dev.schlaubi.mikmusic.checks.joinSameChannelCheck
 import dev.schlaubi.mikmusic.checks.musicControlCheck
+import dev.schlaubi.mikmusic.core.Config
 import dev.schlaubi.mikmusic.core.MusicModule
 import dev.schlaubi.mikmusic.core.checkOtherSchedulerOptions
 import dev.schlaubi.mikmusic.core.settings.MusicSettingsDatabase
@@ -150,7 +151,7 @@ suspend fun Link.takeFirstMatch(musicPlayer: MusicPlayer, query: String): List<T
     val queryString = if (isUrl) {
         query
     } else {
-        "dzsearch: $query"
+        "${Config.DEFAULT_SEARCH_PROVIDER}: $query"
     }
 
     return when (val result = loadItem(queryString)) {

diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/queue/TrackFinder.kt
@@ -14,6 +14,7 @@ import dev.kord.rest.builder.message.create.embed
 import dev.schlaubi.lavakord.rest.loadItem
 import dev.schlaubi.mikbot.plugin.api.util.EditableMessageSender
 import dev.schlaubi.mikmusic.autocomplete.autoCompletedYouTubeQuery
+import dev.schlaubi.mikmusic.core.Config
 import dev.schlaubi.mikmusic.player.MusicPlayer
 import dev.schlaubi.mikmusic.player.SimpleQueuedTrack
 import mu.KotlinLogging
@@ -96,7 +97,7 @@ internal suspend fun CommandContext.findTracks(
     val isUrl = urlProtocol.find(rawQuery) != null
 
     val query = if (!isUrl) {
-        val searchPrefix = if (arguments.searchProvider != null) "${arguments.searchProvider?.prefix}" else "dzsearch:"
+        val searchPrefix = if (arguments.searchProvider != null) "${arguments.searchProvider?.prefix}" else "${Config.DEFAULT_SEARCH_PROVIDER}:"
 
         searchPrefix + rawQuery
     } else rawQuery