Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

add checks to the skip command
Some checks failed
Deploy to Dokku / docker (ubuntu-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lee
2024-07-06 00:41:31 +01:00
parent 27244d0d98
commit 3126935057
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/cc/fascinated/bat/features/spotify/SpotifyFeature.java
View File

@ -110,19 +110,24 @@ public class SpotifyFeature extends Feature {
if (!profile.hasLinkedAccount() || !spotifyService.hasTrackPlaying(user)) {
return checkSpotify(spotifyService, user);
}
CurrentlyPlaying currentlyPlaying = spotifyService.getCurrentlyPlayingTrack(user);
Track track = (Track) currentlyPlaying.getItem();
String trackName = track.getName();
for (Action action : currentlyPlaying.getActions().getDisallows().getDisallowedActions()) {
if (action.equals(Action.SKIPPING_NEXT)) {
return EmbedUtils.errorEmbed()
.setDescription("%s Unable to skip the track.".formatted(Emojis.CROSS_MARK_EMOJI));
}
}
spotifyService.skipTrack(user);
spotifyService.skipTrack(user); // Skip the track
// Get the new track
CurrentlyPlaying newCurrentlyPlaying = SpotifyUtils.getNewTrack(spotifyService, user, trackName);
if (newCurrentlyPlaying == null) {
return EmbedUtils.errorEmbed()
.setDescription("%s There are no more tracks in the queue.".formatted(Emojis.CROSS_MARK_EMOJI));
}
Track newTrack = (Track) newCurrentlyPlaying.getItem();
return EmbedUtils.successEmbed()
.setDescription("""
:track_next: Skipped the track: **[%s | %s](%s)**