Skip with count and implement remove

commands/music.go

@@ -240,6 +240,13 @@ var music = discord.SlashCommandCreate{
 		discord.ApplicationCommandOptionSubCommand{
 			Name:        "skip",
 			Description: "Skips the current track",
+			Options: []discord.ApplicationCommandOption{
+				discord.ApplicationCommandOptionInt{
+					Name:        "count",
+					Description: "The number of tracks to skip",
+					Required:    false,
+				},
+			},
 		},
 		discord.ApplicationCommandOptionSubCommand{
 			Name:        "pause",
@@ -345,6 +352,7 @@ var music = discord.SlashCommandCreate{
 					Description:  "The index of the track to remove",
 					Required:     true,
 					Autocomplete: true,
+					MinValue:     json.Ptr(0),
 				},
 			},
 		},

commands/remove.go

@@ -0,0 +1,21 @@
+package commands
+
+import (
+	"fmt"
+	"github.com/disgoorg/disgo/discord"
+	"github.com/disgoorg/disgo/handler"
+)
+
+func (c *Commands) Remove(data discord.SlashCommandInteractionData, e *handler.CommandEvent) error {
+	index := data.Int("index")
+	ok := c.MusicQueue.Remove(*e.GuildID(), index-1, index)
+	if !ok {
+		return e.CreateMessage(discord.MessageCreate{
+			Content: fmt.Sprintf("Failed to remove track %d from queue", index),
+		})
+	}
+
+	return e.CreateMessage(discord.MessageCreate{
+		Content: fmt.Sprintf("Removed track %d from queue", index),
+	})
+}

commands/skip.go

@@ -2,31 +2,38 @@ package commands
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/handler"
 	"github.com/disgoorg/disgolink/v3/lavalink"
 )
 
-func (c *Commands) Skip(_ discord.SlashCommandInteractionData, e *handler.CommandEvent) error {
+func (c *Commands) Skip(data discord.SlashCommandInteractionData, e *handler.CommandEvent) error {
 	ctx, cancel := context.WithTimeout(e.Ctx, 10*time.Second)
 	defer cancel()
+
+	var trackCount = data.Int("count")
+	if trackCount == 0 {
+		trackCount = 1
+	}
+
 	player := c.Lavalink.ExistingPlayer(*e.GuildID())
-	track, ok := c.MusicQueue.Next(*e.GuildID())
+	track, ok := c.MusicQueue.NextCount(*e.GuildID(), trackCount)
 	if !ok {
 		return e.CreateMessage(discord.MessageCreate{
-			Content: "No more tracks in queue",
+			Content: "Not enough tracks to skip",
 			Flags:   discord.MessageFlagEphemeral,
 		})
 	}
 	if err := player.Update(ctx, lavalink.WithTrack(track)); err != nil {
 		return e.CreateMessage(discord.MessageCreate{
-			Content: "Failed to play skip track",
+			Content: "Failed to skip track(s)",
 		})
 	}
 
 	return e.CreateMessage(discord.MessageCreate{
-		Content: "⏭ Skipped track",
+		Content: fmt.Sprintf("⏭ Skipped %d track(s)", trackCount),
 	})
 }

lavalinkbot/queue.go

@@ -76,20 +76,26 @@ func (q *PlayerManager) Add(guildID snowflake.ID, channelID snowflake.ID, tracks
 	qq.tracks = append(qq.tracks, tracks...)
 }
 
-func (q *PlayerManager) Remove(guildID snowflake.ID, from int, to int) {
+func (q *PlayerManager) Remove(guildID snowflake.ID, from int, to int) bool {
 	q.mu.Lock()
 	defer q.mu.Unlock()
 
 	qq, ok := q.queues[guildID]
 	if !ok {
-		return
+		return false
+	}
+
+	queueLen := len(qq.tracks)
+	if from >= queueLen || to >= queueLen {
+		return false
 	}
 
 	if to == 0 {
 		to = from + 1
 	}
 
 	qq.tracks = append(qq.tracks[:from], qq.tracks[to:]...)
+	return true
 }
 
 func (q *PlayerManager) Clear(guildID snowflake.ID) {
@@ -132,22 +138,27 @@ func (q *PlayerManager) SetRepeatMode(guildID snowflake.ID, mode RepeatMode) {
 }
 
 func (q *PlayerManager) Next(guildID snowflake.ID) (lavalink.Track, bool) {
+	return q.NextCount(guildID, 1)
+}
+
+func (q *PlayerManager) NextCount(guildID snowflake.ID, count int) (lavalink.Track, bool) {
 	q.mu.Lock()
 	defer q.mu.Unlock()
 
 	qq, ok := q.queues[guildID]
 	if !ok {
 		return lavalink.Track{}, false
 	}
-	if len(qq.tracks) == 0 {
+	if len(qq.tracks) < count {
 		return lavalink.Track{}, false
 	}
-	track := qq.tracks[0]
+
+	track := qq.tracks[count-1]
 	if qq.mode != RepeatModeTrack {
 		if qq.mode == RepeatModeQueue {
 			qq.tracks = append(qq.tracks, track)
 		}
-		qq.tracks = qq.tracks[1:]
+		qq.tracks = qq.tracks[count:]
 	}
 	return track, true
 }

main.go

@@ -97,7 +97,7 @@ func main() {
 			r.SlashCommand("/queue", cmds.Queue)
 			r.SlashCommand("/now-playing", cmds.NowPlaying)
 			// r.SlashCommand("/lyrics", cmds.Lyrics)
-			// r.SlashCommand("/remove", cmds.Remove)
+			r.SlashCommand("/remove", cmds.Remove)
 			// r.SlashCommand("/move", cmds.Move)
 			// r.SlashCommand("/swap", cmds.Swap)
 			// r.SlashCommand("/clear", cmds.Clear)