Skip to content

Commit 54b2fbd

Browse files
Fix bug where using music commands outside of voice channel resulted in failed command interaction
1 parent 92122b0 commit 54b2fbd

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

src/main/java/technobot/commands/music/PauseCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ public PauseCommand(TechnoBot bot) {
2323

2424
@Override
2525
public void execute(SlashCommandInteractionEvent event) {
26+
event.deferReply().queue();
2627
MusicHandler music = bot.musicListener.getMusic(event, false);
2728
if (music == null) return;
2829

2930
if (music.isPaused()) {
3031
String text = "The player is already paused!";
31-
event.replyEmbeds(EmbedUtils.createError(text)).queue();
32+
event.getHook().sendMessageEmbeds(EmbedUtils.createError(text)).queue();
3233
} else {
3334
String text = ":pause_button: Paused the music player!";
3435
music.pause();
35-
event.replyEmbeds(EmbedUtils.createDefault(text)).queue();
36+
event.getHook().sendMessageEmbeds(EmbedUtils.createDefault(text)).queue();
3637
}
3738
}
3839
}

src/main/java/technobot/commands/music/RepeatCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public RepeatCommand(TechnoBot bot) {
2323

2424
@Override
2525
public void execute(SlashCommandInteractionEvent event) {
26+
event.deferReply().queue();
2627
MusicHandler music = bot.musicListener.getMusic(event, false);
2728
if (music == null) return;
2829

@@ -33,6 +34,6 @@ public void execute(SlashCommandInteractionEvent event) {
3334
} else {
3435
text = ":repeat_one: Loop Disabled!";
3536
}
36-
event.replyEmbeds(EmbedUtils.createDefault(text)).queue();
37+
event.getHook().sendMessageEmbeds(EmbedUtils.createDefault(text)).queue();
3738
}
3839
}

src/main/java/technobot/commands/music/ResumeCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ public ResumeCommand(TechnoBot bot) {
2323

2424
@Override
2525
public void execute(SlashCommandInteractionEvent event) {
26+
event.deferReply().queue();
2627
MusicHandler music = bot.musicListener.getMusic(event, false);
2728
if (music == null) return;
2829

2930
if (music.isPaused()) {
3031
music.unpause();
3132
String text = ":play_pause: Resuming the music player!";
32-
event.replyEmbeds(EmbedUtils.createDefault(text)).queue();
33+
event.getHook().sendMessageEmbeds(EmbedUtils.createDefault(text)).queue();
3334
} else {
3435
String text = "The player is not paused!";
35-
event.replyEmbeds(EmbedUtils.createError(text)).queue();
36+
event.getHook().sendMessageEmbeds(EmbedUtils.createError(text)).queue();
3637
}
3738
}
3839
}

src/main/java/technobot/commands/music/SeekCommand.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public SeekCommand(TechnoBot bot) {
2727

2828
@Override
2929
public void execute(SlashCommandInteractionEvent event) {
30+
event.deferReply().queue();
3031
MusicHandler music = bot.musicListener.getMusic(event, false);
3132
if (music == null) return;
3233

@@ -51,19 +52,19 @@ public void execute(SlashCommandInteractionEvent event) {
5152
// Make sure pos is not longer than track
5253
if (pos >= music.getQueue().getFirst().getDuration()) {
5354
String text = "Time cannot be longer than the song!";
54-
event.replyEmbeds(EmbedUtils.createError(text)).queue();
55+
event.getHook().sendMessageEmbeds(EmbedUtils.createError(text)).queue();
5556
return;
5657
}
5758

5859
// Set position and send message
5960
music.seek(pos);
6061
String text = ":fast_forward: Set position to `" + MusicListener.formatTrackLength(pos) + "`";
61-
event.replyEmbeds(EmbedUtils.createDefault(text)).queue();
62+
event.getHook().sendMessageEmbeds(EmbedUtils.createDefault(text)).queue();
6263

6364
} catch ( NumberFormatException | ArrayIndexOutOfBoundsException e) {
6465
// Invalid timestamps
6566
String text = "That is not a valid timestamp!";
66-
event.replyEmbeds(EmbedUtils.createError(text)).queue();
67+
event.getHook().sendMessageEmbeds(EmbedUtils.createError(text)).queue();
6768
}
6869
}
6970
}

src/main/java/technobot/commands/music/VolumeCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public VolumeCommand(TechnoBot bot) {
2929

3030
@Override
3131
public void execute(SlashCommandInteractionEvent event) {
32+
event.deferReply().queue();
3233
int volume = event.getOption("amount").getAsInt();
3334

3435
MusicHandler music = bot.musicListener.getMusic(event, false);
@@ -39,11 +40,11 @@ public void execute(SlashCommandInteractionEvent event) {
3940
}
4041
music.setVolume(volume);
4142
String text = String.format(":loud_sound: Set volume to %s%%", volume);
42-
event.replyEmbeds(EmbedUtils.createDefault(text)).queue();
43+
event.getHook().sendMessageEmbeds(EmbedUtils.createDefault(text)).queue();
4344
return;
4445
} catch (@NotNull NumberFormatException | ArrayIndexOutOfBoundsException ignored) {}
4546

4647
String text = "You must specify a volume between 0-100";
47-
event.replyEmbeds(EmbedUtils.createError(text)).queue();
48+
event.getHook().sendMessageEmbeds(EmbedUtils.createError(text)).queue();
4849
}
4950
}

0 commit comments

Comments
 (0)