Fix skip command with auto-play

DRSchlaubi · Sep 28, 2024 · fc67535 · fc67535
1 parent 887df06
commit fc67535
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
@@ -1,3 +1,3 @@
 subprojects {
-    version = "3.11.0-SNAPSHOT"
+    version = "3.11.1-SNAPSHOT"
 }
diff --git a/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt b/music/commands/src/main/kotlin/dev/schlaubi/mikmusic/commands/SkipCommand.kt
@@ -23,7 +23,7 @@ suspend fun MusicModule.skipCommand() = ephemeralControlSlashCommand(::SkipArgum
             respond { content = translate("commands.skip.empty") }
             return@action
         }
-        if (arguments.to > musicPlayer.queuedTracks.size) {
+        if (arguments.to > (musicPlayer.queuedTracks.size + musicPlayer.autoPlayTrackCount)) {
             respond {
                 content = translate("commands.skip.exceeds_range")
             }

diff --git a/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/MusicPlayer.kt b/music/player/src/main/kotlin/dev/schlaubi/mikmusic/player/MusicPlayer.kt
@@ -72,6 +72,8 @@ class MusicPlayer(val link: Link, private val guild: GuildBehavior) : Link by li
         get() = guild.kord
     val hasAutoPlay: Boolean
         get() = !autoPlay?.songs.isNullOrEmpty()
+    val autoPlayTrackCount
+        get() = autoPlay?.songs?.size ?: 0
 
     init {
         guild.kord.launch {