From 300d526344bca381e81b9605cd220b54578287b5 Mon Sep 17 00:00:00 2001 From: caneleex Date: Sat, 12 Nov 2022 15:07:17 +0100 Subject: [PATCH 1/2] make skip strings consistent --- dbot/commands/music_player.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbot/commands/music_player.go b/dbot/commands/music_player.go index f52d0e8..62dd32f 100644 --- a/dbot/commands/music_player.go +++ b/dbot/commands/music_player.go @@ -31,7 +31,7 @@ func nextComponentHandler(b *dbot.Bot) handler.ComponentHandler { if err = player.Play(nextTrack); err != nil { return e.CreateMessage(responses.CreateErrorf("Failed to play next song. Please try again.")) } - return e.UpdateMessage(responses.UpdateSuccessComponentsf("Skipped to next song.", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) + return e.UpdateMessage(responses.UpdateSuccessComponentsf("⏭ Skipped to next song.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) } } @@ -88,7 +88,7 @@ func previousComponentHandler(b *dbot.Bot) handler.ComponentHandler { if err = player.Play(nextTrack); err != nil { return e.CreateMessage(responses.CreateErrorf("Failed to play previous song. Please try again.")) } - return e.UpdateMessage(responses.UpdateSuccessComponentsf("Went back to previous song.", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) + return e.UpdateMessage(responses.UpdateSuccessComponentsf("⏮ Skipped track.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) } } From de17076f0f146e505102f25992e774c1666d60ee Mon Sep 17 00:00:00 2001 From: caneleex Date: Sat, 12 Nov 2022 15:12:10 +0100 Subject: [PATCH 2/2] actually make it consistent --- dbot/commands/music_player.go | 2 +- dbot/commands/next.go | 2 +- dbot/commands/previous.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbot/commands/music_player.go b/dbot/commands/music_player.go index 62dd32f..e366e32 100644 --- a/dbot/commands/music_player.go +++ b/dbot/commands/music_player.go @@ -88,7 +88,7 @@ func previousComponentHandler(b *dbot.Bot) handler.ComponentHandler { if err = player.Play(nextTrack); err != nil { return e.CreateMessage(responses.CreateErrorf("Failed to play previous song. Please try again.")) } - return e.UpdateMessage(responses.UpdateSuccessComponentsf("⏮ Skipped track.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) + return e.UpdateMessage(responses.UpdateSuccessComponentsf("⏮ Skipped to previous song.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) } } diff --git a/dbot/commands/next.go b/dbot/commands/next.go index 25fc0dc..8cc531d 100644 --- a/dbot/commands/next.go +++ b/dbot/commands/next.go @@ -33,6 +33,6 @@ func nextHandler(b *dbot.Bot) handler.CommandHandler { if err := player.Play(nextTrack); err != nil { return e.CreateMessage(responses.CreateErrorf("Failed to play next song. Please try again.")) } - return e.CreateMessage(responses.CreateSuccessComponentsf("⏭ Skipped track.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) + return e.CreateMessage(responses.CreateSuccessComponentsf("⏭ Skipped to next song.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack))) } } diff --git a/dbot/commands/previous.go b/dbot/commands/previous.go index 8cd5689..a9a8aef 100644 --- a/dbot/commands/previous.go +++ b/dbot/commands/previous.go @@ -33,6 +33,6 @@ func previousHandler(b *dbot.Bot) handler.CommandHandler { if err := player.Play(previousTrack); err != nil { return e.CreateMessage(responses.CreateErrorf("Failed to play previous song. Please try again.")) } - return e.CreateMessage(responses.CreateSuccessComponentsf("⏮ Skipped track.\nNow playing: %s - %s", []any{formatTrack(previousTrack), previousTrack.Info().Length}, getMusicControllerComponents(previousTrack))) + return e.CreateMessage(responses.CreateSuccessComponentsf("⏮ Skipped to previous song.\nNow playing: %s - %s", []any{formatTrack(previousTrack), previousTrack.Info().Length}, getMusicControllerComponents(previousTrack))) } }