Skip to content

make skip strings consistent #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
topi314 merged 2 commits into from
Nov 12, 2022
Merged

make skip strings consistent #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
300d526
make skip strings consistent
Nov 12, 2022
de17076
actually make it consistent
Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dbot/commands/music_player.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}
}

Expand Down Expand Up @@ -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 to previous song.\nNow playing: %s - %s", []any{formatTrack(nextTrack), nextTrack.Info().Length}, getMusicControllerComponents(nextTrack)))
}
}

Expand Down
2 changes: 1 addition & 1 deletion dbot/commands/next.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}
}
2 changes: 1 addition & 1 deletion dbot/commands/previous.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}
}