Update search provider arguments

DRSchlaubi · Jul 18, 2023 · cad306b · cad306b
1 parent 60b26d0
commit cad306b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/context/PlayMessageAction.kt
@@ -32,7 +32,7 @@ suspend fun MusicModule.playMessageAction() = ephemeralMessageCommand {
 class PlayMessageActionArguments(override val query: String) : QueueOptions {
     override val force: Boolean = false
     override val top: Boolean = false
-    override val soundcloud: Boolean = false
+    override val searchProvider: QueueOptions.SearchProvider? = null
 }
 
 private suspend fun EphemeralMessageCommandContext<*>.queue(

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/AddCommand.kt
@@ -1,5 +1,6 @@
 package dev.schlaubi.mikmusic.playlist.commands
 
+import com.kotlindiscord.kord.extensions.commands.application.slash.converters.impl.optionalEnumChoice
 import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingBoolean
 import com.kotlindiscord.kord.extensions.types.respond
 import dev.kord.rest.builder.message.create.embed
@@ -11,10 +12,9 @@ import dev.schlaubi.mikmusic.playlist.mapToEncoded
 
 class PlaylistAddArguments : PlaylistArguments(), QueueOptions {
     override val query by autoCompletedYouTubeQuery("commands.playlist.add.arguments.query.description")
-    override val soundcloud by defaultingBoolean {
-        name = "soundcloud"
-        description = "commands.playlist.add.arguments.soundscloud.description"
-        defaultValue = false
+    override val searchProvider: QueueOptions.SearchProvider? by optionalEnumChoice<QueueOptions.SearchProvider> {
+        name = "search-provider"
+        description = "The search provider to use"
     }
     val search by defaultingBoolean {
         name = "search"

diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/playlist/commands/SaveCommand.kt
@@ -31,7 +31,7 @@ class PlaylistSaveArguments : Arguments(), QueueOptions {
         get() = importFrom ?: error("Cannot find tracks if importFrom is not specified")
     override val force: Boolean = false
     override val top: Boolean = false
-    override val soundcloud: Boolean = false
+    override val searchProvider: QueueOptions.SearchProvider? = null
 }
 
 fun PlaylistModule.saveCommand() = ephemeralSubCommand(::PlaylistSaveArguments) {

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
@@ -27,7 +27,7 @@ interface QueueOptions {
     val query: String
     val force: Boolean
     val top: Boolean
-    val search: SearchProvider?
+    val searchProvider: SearchProvider?
 
     enum class SearchProvider(override val readableName: String, val prefix: String) : ChoiceEnum {
         YouTube("YouTube", "ytsearch:"),
@@ -47,7 +47,7 @@ abstract class QueueArguments : Arguments(), QueueOptions {
         description = "Adds this item to the top of the queueTracks"
         defaultValue = false
     }
-    override val search by optionalEnumChoice<QueueOptions.SearchProvider> {
+    override val searchProvider by optionalEnumChoice<QueueOptions.SearchProvider> {
         name = "search-provider"
         description = "Which searchprovider to use"
     }
@@ -95,7 +95,7 @@ internal suspend fun CommandContext.findTracks(
     val isUrl = urlProtocol.find(rawQuery) != null
 
     val query = if (!isUrl) {
-        val searchPrefix = if (arguments.search != null) "${arguments.search?.prefix}" else "dzsearch:"
+        val searchPrefix = if (arguments.searchProvider != null) "${arguments.searchProvider?.prefix}" else "dzsearch:"
 
         searchPrefix + rawQuery
     } else rawQuery