add requester & track original

Author: topi314

commands/now_playing.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"bytes"
 	"fmt"
 
 	"github.com/disgoorg/disgo/discord"
@@ -19,7 +20,16 @@ func (c *Commands) NowPlaying(e *handler.CommandEvent) error {
 		})
 	}
 	content := fmt.Sprintf("Now playing: %s", res.FormatTrack(*track, player.Position()))
+	var userData UserData
+	_ = track.UserData.Unmarshal(&userData)
+	if userData.Requester > 0 {
+		content += "\nRequested by: " + discord.UserMention(userData.Requester)
+	}
+	if userData.OriginType == "playlist" {
+		content += fmt.Sprintf("\nFrom: %s", userData.OriginName)
+	}
 
+	var files []*discord.File
 	if e.SlashCommandInteractionData().Bool("raw") {
 		data, err := json.MarshalIndent(track, "", "  ")
 		if err != nil {
@@ -28,11 +38,15 @@ func (c *Commands) NowPlaying(e *handler.CommandEvent) error {
 				Flags:   discord.MessageFlagEphemeral,
 			})
 		}
-
-		content += fmt.Sprintf("\n```json\n%s\n```", data)
+		files = append(files, &discord.File{
+			Name:   "track.json",
+			Reader: bytes.NewReader(data),
+		})
 	}
 
 	return e.CreateMessage(discord.MessageCreate{
-		Content: content,
+		Content:         content,
+		AllowedMentions: &discord.AllowedMentions{},
+		Files:           files,
 	})
 }

commands/play.go

@@ -14,6 +14,7 @@ import (
 	"github.com/disgoorg/json"
 	"github.com/disgoorg/lavasearch-plugin"
 	"github.com/disgoorg/lavasrc-plugin"
+	"github.com/disgoorg/snowflake/v2"
 	"github.com/lavalink-devs/lavalink-bot/internal/res"
 	"go.deanishe.net/fuzzy"
 )
@@ -23,12 +24,27 @@ var (
 	queryPattern = regexp.MustCompile(`^(.{2})(search|isrc):(.+)`)
 )
 
+type UserData struct {
+	Requester  snowflake.ID `json:"requester"`
+	OriginType string       `json:"origin_type"`
+	OriginName string       `json:"origin_name"`
+}
+
 func (c *Commands) PlayAutocomplete(e *handler.AutocompleteEvent) error {
 	query := e.Data.String("query")
 	if query == "" {
 		return e.AutocompleteResult(nil)
 	}
 
+	if urlPattern.MatchString(query) {
+		return e.AutocompleteResult([]discord.AutocompleteChoice{
+			discord.AutocompleteChoiceString{
+				Name:  res.Trim("🔗 "+query, 100),
+				Value: query,
+			},
+		})
+	}
+
 	source := lavalink.SearchType(e.Data.String("source"))
 	if source == "" {
 		source = "dzsearch"
@@ -186,6 +202,9 @@ func (c *Commands) Play(e *handler.CommandEvent) error {
 	var (
 		tracks         []lavalink.Track
 		messageContent string
+		userData       = UserData{
+			Requester: e.User().ID,
+		}
 	)
 	switch loadData := result.Data.(type) {
 	case lavalink.Track:
@@ -194,7 +213,9 @@ func (c *Commands) Play(e *handler.CommandEvent) error {
 	case lavalink.Playlist:
 		tracks = append(tracks, loadData.Tracks...)
 		playlistType, playlistName := res.FormatPlaylist(loadData)
-		messageContent = fmt.Sprintf("Loaded %s **%s**", playlistType, playlistName)
+		messageContent = fmt.Sprintf("Loaded %s **%s** - `%d tracks`", playlistType, playlistName, len(loadData.Tracks))
+		userData.OriginType = playlistType
+		userData.OriginName = playlistName
 	case lavalink.Search:
 		tracks = append(tracks, loadData[0])
 		messageContent = fmt.Sprintf("Loaded track **%s** from search", res.FormatTrack(loadData[0], 0))
@@ -223,6 +244,11 @@ func (c *Commands) Play(e *handler.CommandEvent) error {
 		return err
 	}
 
+	userDataRaw, _ := json.Marshal(userData)
+	for i := range tracks {
+		tracks[i].UserData = userDataRaw
+	}
+
 	player := c.Lavalink.Player(*e.GuildID())
 	if player.Track() == nil {
 		var track lavalink.Track

go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/disgoorg/disgo v0.17.0
-	github.com/disgoorg/disgolink/v3 v3.0.0-20231123221557-7482a52d013a
+	github.com/disgoorg/disgolink/v3 v3.0.0-20231126174358-f0db0ed57f17
 	github.com/disgoorg/json v1.1.0
 	github.com/disgoorg/lavasearch-plugin v0.0.0-20230812211104-12547850ae07
 	github.com/disgoorg/lavasrc-plugin v0.0.0-20230812211312-b2484e9b20da

go.sum

@@ -9,8 +9,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disgoorg/disgo v0.17.0 h1:/LcgXgPDhzHt3GkQ4cpjmIJBim1/VYfS31VhGYif3Ms=
 github.com/disgoorg/disgo v0.17.0/go.mod h1:AE2J/8oLR2PtYfqcARsk1mgBxQ5z3Z1OD6Lc2SA0gak=
-github.com/disgoorg/disgolink/v3 v3.0.0-20231123221557-7482a52d013a h1:Q4rsO+hwjRYELK0X43fUft02BJBN3nleVImxNxzUnjM=
-github.com/disgoorg/disgolink/v3 v3.0.0-20231123221557-7482a52d013a/go.mod h1:YIwjIteZcjfI7HYZWH241iRI7RjTLoN51HLDOUHVSFI=
+github.com/disgoorg/disgolink/v3 v3.0.0-20231126174358-f0db0ed57f17 h1:UqxupfVPqaiMWGr7xVrQmmrZCG2Y/9sosqkCDWyo9VU=
+github.com/disgoorg/disgolink/v3 v3.0.0-20231126174358-f0db0ed57f17/go.mod h1:YIwjIteZcjfI7HYZWH241iRI7RjTLoN51HLDOUHVSFI=
 github.com/disgoorg/json v1.1.0 h1:7xigHvomlVA9PQw9bMGO02PHGJJPqvX5AnwlYg/Tnys=
 github.com/disgoorg/json v1.1.0/go.mod h1:BHDwdde0rpQFDVsRLKhma6Y7fTbQKub/zdGO5O9NqqA=
 github.com/disgoorg/lavasearch-plugin v0.0.0-20230812211104-12547850ae07 h1:hf3vNsBK1gp1TEqonO3YYG8NxJswbLe6BusUalMnYfg=

handlers/lavalink.go

@@ -11,6 +11,7 @@ import (
 	"github.com/disgoorg/disgolink/v3/disgolink"
 	"github.com/disgoorg/disgolink/v3/lavalink"
 	"github.com/disgoorg/sponsorblock-plugin"
+	"github.com/lavalink-devs/lavalink-bot/commands"
 	"github.com/lavalink-devs/lavalink-bot/internal/res"
 	"github.com/topi314/tint"
 )
@@ -55,8 +56,20 @@ func (h *Handlers) OnTrackStart(p disgolink.Player, event lavalink.TrackStartEve
 	if channelID == 0 {
 		return
 	}
+
+	content := "Now playing: " + res.FormatTrack(event.Track, 0)
+	var userData commands.UserData
+	_ = event.Track.UserData.Unmarshal(&userData)
+	if userData.Requester > 0 {
+		content += "\nRequested by: " + discord.UserMention(userData.Requester)
+	}
+	if userData.OriginType == "playlist" {
+		content += fmt.Sprintf("\nFrom: %s", userData.OriginName)
+	}
+
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: "Now playing: " + res.FormatTrack(event.Track, 0),
+		Content:         content,
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -78,7 +91,8 @@ func (h *Handlers) OnTrackEnd(p disgolink.Player, event lavalink.TrackEndEvent)
 			return
 		}
 		if _, err = h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-			Content: "failed to start next track: " + err.Error(),
+			Content:         "failed to start next track: " + err.Error(),
+			AllowedMentions: &discord.AllowedMentions{},
 		}); err != nil {
 			slog.Error("failed to send message", tint.Err(err))
 		}
@@ -91,7 +105,8 @@ func (h *Handlers) OnTrackException(p disgolink.Player, event lavalink.TrackExce
 		return
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: "Track exception: " + event.Exception.Error(),
+		Content:         "Track exception: " + event.Exception.Error(),
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -103,7 +118,8 @@ func (h *Handlers) OnTrackStuck(p disgolink.Player, event lavalink.TrackStuckEve
 		return
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: "Track stuck: " + event.Track.Info.Title,
+		Content:         "Track stuck: " + event.Track.Info.Title,
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -138,7 +154,8 @@ func (h *Handlers) OnSegmentsLoaded(p disgolink.Player, event sponsorblock.Segme
 		content += line
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: content,
+		Content:         content,
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -150,7 +167,8 @@ func (h *Handlers) OndSegmentSkipped(p disgolink.Player, event sponsorblock.Segm
 		return
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: fmt.Sprintf("Segment skipped: %s: %s - %s", event.Segment.Category, res.FormatDuration(event.Segment.Start), res.FormatDuration(event.Segment.End)),
+		Content:         fmt.Sprintf("Segment skipped: %s: %s - %s", event.Segment.Category, res.FormatDuration(event.Segment.Start), res.FormatDuration(event.Segment.End)),
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -172,7 +190,8 @@ func (h *Handlers) OnChaptersLoaded(p disgolink.Player, event sponsorblock.Chapt
 		content += line
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: content,
+		Content:         content,
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}
@@ -184,7 +203,8 @@ func (h *Handlers) OnChapterStarted(p disgolink.Player, event sponsorblock.Chapt
 		return
 	}
 	if _, err := h.Client.Rest().CreateMessage(channelID, discord.MessageCreate{
-		Content: fmt.Sprintf("Chapter started: %s: %s - %s", event.Chapter.Name, res.FormatDuration(event.Chapter.Start), res.FormatDuration(event.Chapter.End)),
+		Content:         fmt.Sprintf("Chapter started: %s: %s - %s", event.Chapter.Name, res.FormatDuration(event.Chapter.Start), res.FormatDuration(event.Chapter.End)),
+		AllowedMentions: &discord.AllowedMentions{},
 	}); err != nil {
 		slog.Error("failed to send message", tint.Err(err))
 	}

internal/res/playlist.go

@@ -23,8 +23,8 @@ func FormatPlaylist(playlist lavalink.Playlist) (string, string) {
 		name = lavasrcInfo.Author + " - " + name
 	}
 	if lavasrcInfo.URL != "" {
-		return playlistType, fmt.Sprintf("[`%s`](<%s>) - `%d tracks`", name, lavasrcInfo.URL, len(playlist.Tracks))
+		return playlistType, fmt.Sprintf("[`%s`](<%s>)", name, lavasrcInfo.URL)
 	}
 
-	return playlistType, fmt.Sprintf("`%s` - `%d tracks`", name, len(playlist.Tracks))
+	return playlistType, fmt.Sprintf("`%s`", name)
 }

internal/res/track.go

@@ -40,7 +40,6 @@ func FormatTrack(track lavalink.Track, position lavalink.Duration) string {
 		if lavasrcInfo.AlbumURL != "" {
 			albumName = fmt.Sprintf("[`%s`](<%s>)", lavasrcInfo.AlbumName, lavasrcInfo.AlbumURL)
 		}
-
 		return fmt.Sprintf("%s - %s %s - %s", trackName, trackAuthor, positionStr, albumName)
 	}