Skip to content

Commit ed58ed0

Browse files
committed
rename track to song in messages
1 parent ea79ac6 commit ed58ed0

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

dbot/command_checks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func IsPlaying(b *Bot) handler.Check[*events.ApplicationCommandInteractionCreate
8888
if b.MusicPlayers.Get(*ctx.GuildID()).PlayingTrack() == nil {
8989
if err := ctx.CreateMessage(
9090
discord.MessageCreate{
91-
Content: "No track is currently playing.",
91+
Content: "No song is currently playing.",
9292
Flags: discord.MessageFlagEphemeral,
9393
}); err != nil {
9494
b.Logger.Error(err)

dbot/commands/next.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func nextHandler(b *dbot.Bot) handler.CommandHandler {
2727
nextTrack := player.Queue.Pop()
2828

2929
if nextTrack == nil {
30-
return e.CreateMessage(responses.CreateErrorf("No next track found in queue."))
30+
return e.CreateMessage(responses.CreateErrorf("No next song found in queue."))
3131
}
3232

3333
if err := player.Play(nextTrack); err != nil {

dbot/commands/now-playing.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ func nowPlayingHandler(b *dbot.Bot) handler.CommandHandler {
3333
}
3434
i := track.Info()
3535
embed := discord.NewEmbedBuilder().
36-
SetDescriptionf("Currently playing: ", formatTrack(track)).
36+
SetDescriptionf("Currently playing: %s", formatTrack(track)).
3737
AddField("Author:", i.Author, true).
3838
AddField("Requested by:", discord.UserMention(track.UserData().(dbot.AudioTrackData).Requester), true).
3939
AddField("Volume:", fmt.Sprintf("%d%%", player.Volume()), true).
4040
SetThumbnail(getArtworkURL(player.PlayingTrack())).
41-
SetFooterText(fmt.Sprintf("Tracks in queue: %d", player.Queue.Len()))
41+
SetFooterText(fmt.Sprintf("Songs in queue: %d", player.Queue.Len()))
4242
if !i.IsStream {
4343
bar := [10]string{"▬", "▬", "▬", "▬", "▬", "▬", "▬", "▬", "▬", "▬"}
4444
t1 := player.Position()

dbot/commands/play.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,35 +110,35 @@ func playHandler(b *dbot.Bot) handler.CommandHandler {
110110
err := b.Lavalink.BestRestClient().LoadItemHandler(context.TODO(), query, lavalink.NewResultHandler(
111111
func(track lavalink.AudioTrack) {
112112
if err := b.DB.PlayHistory().Add(e.User().ID, query, track.Info().Title); err != nil {
113-
b.Logger.Error("Failed to add track to play history: ", err)
113+
b.Logger.Error("Failed to add song to play history: ", err)
114114
}
115115
playAndQueue(b, e.BaseInteraction, track)
116116
},
117117
func(playlist lavalink.AudioPlaylist) {
118118
if err := b.DB.PlayHistory().Add(e.User().ID, query, playlist.Name()); err != nil {
119-
b.Logger.Error("Failed to add track to play history: ", err)
119+
b.Logger.Error("Failed to add song to play history: ", err)
120120
}
121121
playAndQueue(b, e.BaseInteraction, playlist.Tracks()...)
122122
},
123123
func(tracks []lavalink.AudioTrack) {
124124
if err := b.DB.PlayHistory().Add(e.User().ID, query, data.String("query")); err != nil {
125-
b.Logger.Error("Failed to add track to play history: ", err)
125+
b.Logger.Error("Failed to add song to play history: ", err)
126126
}
127127
giveSearchSelection(b, e, tracks)
128128
},
129129
func() {
130-
if _, err := e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("No track/s found for your link/query")); err != nil {
130+
if _, err := e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("No song/s found for your link/query")); err != nil {
131131
b.Logger.Error("Failed to update not found message: ", err)
132132
}
133133
},
134134
func(ex lavalink.FriendlyException) {
135-
if _, err := e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("Failed to load track/s: %s", ex.Message)); err != nil {
135+
if _, err := e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("Failed to load song/s: %s", ex.Message)); err != nil {
136136
b.Logger.Error("Failed to update error message: ", err)
137137
}
138138
},
139139
))
140140
if err != nil {
141-
if _, err = e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("Failed to lookup track. Please try again.")); err != nil {
141+
if _, err = e.Client().Rest().UpdateInteractionResponse(e.ApplicationID(), e.Token(), responses.UpdateErrorf("Failed to lookup song. Please try again.")); err != nil {
142142
b.Logger.Error("Failed to update error message: ", err)
143143
}
144144
}

dbot/commands/previous.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func previousHandler(b *dbot.Bot) handler.CommandHandler {
2727
previousTrack := player.History.Last()
2828

2929
if previousTrack == nil {
30-
return e.CreateMessage(responses.CreateErrorf("No track found in history."))
30+
return e.CreateMessage(responses.CreateErrorf("No song found in history."))
3131
}
3232

3333
if err := player.Play(previousTrack); err != nil {

dbot/commands/remove.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func removeSongHandler(b *dbot.Bot) handler.CommandHandler {
6969
removeTrack := player.Queue.Get(index - 1)
7070
if removeTrack == nil {
7171
return e.CreateMessage(discord.MessageCreate{
72-
Content: fmt.Sprintf("No track found with index `%d`.", index),
72+
Content: fmt.Sprintf("No song found with index `%d`.", index),
7373
Flags: discord.MessageFlagEphemeral,
7474
})
7575
}

dbot/commands/shuffle.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func shuffleHandler(b *dbot.Bot) handler.CommandHandler {
2626
queue := b.MusicPlayers.Get(*e.GuildID()).Queue
2727

2828
if queue.Len() == 0 {
29-
return e.CreateMessage(responses.CreateErrorf("No tracks in queue to shuffle."))
29+
return e.CreateMessage(responses.CreateErrorf("No songs in queue to shuffle."))
3030
}
3131
return e.CreateMessage(responses.CreateSuccessf("🔀 Shuffled the queue."))
3232
}

0 commit comments

Comments
 (0)