Added some more messages to be sent when running the music commands...

Author: RealMangorage

src/main/java/org/mangorage/mangobotplugin/commands/music/AudioLoader.java

@@ -3,37 +3,39 @@
 
 import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler;
 import dev.arbjerg.lavalink.client.player.*;
+import net.dv8tion.jda.api.entities.Message;
 
 import java.util.List;
 
 public final class AudioLoader extends AbstractAudioLoadResultHandler {
     private final GuildMusicManager mngr;
+    private final Message message;
 
-    public AudioLoader(GuildMusicManager mngr) {
+    public AudioLoader(GuildMusicManager mngr, Message message) {
         this.mngr = mngr;
+        this.message = message;
     }
 
     @Override
     public void ontrackLoaded(TrackLoaded result) {
         final Track track = result.getTrack();
 
-        var userData = new MyUserData(0l);
+        var userData = new MyUserData(message.getAuthor().getIdLong());
 
         track.setUserData(userData);
 
         this.mngr.scheduler.enqueue(track);
 
         final var trackTitle = track.getInfo().getTitle();
 
-//        event.getHook().sendMessage("Added to queue: " + trackTitle + "\nRequested by: <@" + userData.requester() + '>').queue();
+        message.reply("Added to queue: " + trackTitle + "\nRequested by: <@" + userData.requester() + '>').queue();
     }
 
     @Override
     public void onPlaylistLoaded(PlaylistLoaded result) {
         final int trackCount = result.getTracks().size();
-//        event.getHook()
-//                .sendMessage("Added " + trackCount + " tracks to the queue from " + result.getInfo().getName() + "!")
-//                .queue();
+        message.reply("Added " + trackCount + " tracks to the queue from " + result.getInfo().getName() + "!")
+                .queue();
 
         this.mngr.scheduler.enqueuePlaylist(result.getTracks());
     }
@@ -49,18 +51,18 @@ public void onSearchResultLoaded(SearchResult result) {
 
         final Track firstTrack = tracks.get(0);
 
-        //event.getHook().sendMessage("Adding to queue: " + firstTrack.getInfo().getTitle()).queue();
+        message.reply("Adding to queue: " + firstTrack.getInfo().getTitle()).queue();
 
         this.mngr.scheduler.enqueue(firstTrack);
     }
 
     @Override
     public void noMatches() {
-        //event.getHook().sendMessage("No matches found for your input!").queue();
+        message.reply("No matches found for your input!").queue();
     }
 
     @Override
     public void loadFailed(LoadFailed result) {
-        //.getHook().sendMessage("Failed to load track! " + result.getException().getMessage()).queue();
+        message.reply("Failed to load track! " + result.getException().getMessage()).queue();
     }
 }

src/main/java/org/mangorage/mangobotplugin/commands/music/impl/JoinCommand.java

@@ -29,19 +29,26 @@ public JDACommandResult run(CommandContext<Message> commandContext) throws Throw
         final var context = commandContext.getContextObject();
         final var member = context.getMember();
 
-        joinHelper(member, commandContext.getContextObject().getJDA());
+        if(joinHelper(member, commandContext.getContextObject().getJDA())) {
+            context.reply("Joined Voice Channel!").queue();
+        } else {
+            context.reply("Please move to a Voice Channel!").queue();
+        }
 
         return JDACommandResult.PASS;
     }
 
     // Makes sure that the bot is in a voice channel!
-    private void joinHelper(Member member, JDA jda) {
+    private boolean joinHelper(Member member, JDA jda) {
+        musicManager.getOrCreate(member.getGuild().getIdLong());
+
         final GuildVoiceState memberVoiceState = member.getVoiceState();
 
         if (memberVoiceState.inAudioChannel()) {
             jda.getDirectAudioController().connect(memberVoiceState.getChannel());
+            return true;
         }
 
-        musicManager.getOrCreate(member.getGuild().getIdLong());
+        return false;
     }
 }

src/main/java/org/mangorage/mangobotplugin/commands/music/impl/PauseCommand.java

@@ -26,13 +26,16 @@ public JDACommandType getCommandType() {
 
     @Override
     public JDACommandResult run(CommandContext<Message> commandContext) throws Throwable {
+        final var context = commandContext.getContextObject();
         final var guild = commandContext.getContextObject().getGuild();
 
         final var guildManager = manager.getOrCreate(guild.getIdLong());
 
         guildManager.getPlayer()
                 .ifPresent(player -> {
-                    player.setPaused(true).subscribe();
+                    player.setPaused(true).subscribe(plr -> {
+                        context.reply("Paused Music!").queue();
+                    });
                 });
 
         return JDACommandResult.PASS;

src/main/java/org/mangorage/mangobotplugin/commands/music/impl/PlayCommand.java

@@ -1,5 +1,8 @@
 package org.mangorage.mangobotplugin.commands.music.impl;
 
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.GuildVoiceState;
+import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import org.mangorage.mangobotcore.api.command.v1.CommandContext;
 import org.mangorage.mangobotcore.api.command.v1.argument.OptionalArg;
@@ -11,6 +14,8 @@
 import org.mangorage.mangobotplugin.commands.music.AudioLoader;
 import org.mangorage.mangobotplugin.commands.music.IMusicManager;
 
+import java.util.concurrent.TimeUnit;
+
 public final class PlayCommand extends AbstractJDACommand {
 
     private final OptionalArg<String> identifierArg = new OptionalArg<>("identifier", "Identifier", StringArgumentType.single(), null);
@@ -28,25 +33,64 @@ public JDACommandType getCommandType() {
 
     @Override
     public JDACommandResult run(CommandContext<Message> commandContext) throws Throwable {
-        final var guild = commandContext.getContextObject().getGuild();
+        final var context = commandContext.getContextObject();
+        final var guild = context.getGuild();
         final var identifier = commandContext.getArgumentOrElse(identifierArg);
 
+        final var member = context.getMember();
+
+        if (!member.getVoiceState().inAudioChannel()) {
+            context.reply("Must be in a voice chat!").queue();
+            return JDACommandResult.PASS;
+        }
+
         final var guildManager = manager.getOrCreate(guild.getIdLong());
         final var player = guildManager.getPlayer();
 
         if (identifier == null) {
             if (player.isPresent())
                 player.get()
                         .setPaused(false)
-                        .subscribe();
+                        .subscribe(plr -> {
+                            context.reply("Unpaused music!").queue();
+                        });
         } else {
-            guildManager
-                    .getLink()
-                    .ifPresent(link -> {
-                        link.loadItem(identifier).subscribe(new AudioLoader(guildManager));
-                    });
+            joinHelper(member, member.getJDA());
+
+            if (guildManager.getPlayer().isPresent()) {
+                guildManager
+                        .getLink()
+                        .ifPresent(link -> {
+                            context.reply("Playing Track Soon!").queue();
+                            link.loadItem(identifier).subscribe(new AudioLoader(guildManager, context));
+                        });
+            } else {
+
+                context.reply("Playing Track Soon!")
+                        .queueAfter(2, TimeUnit.SECONDS, m -> {
+                            guildManager
+                                    .getLink()
+                                    .ifPresent(link -> {
+                                        link.loadItem(identifier).subscribe(new AudioLoader(guildManager, context));
+                                    });
+                        });
+            }
         }
 
         return JDACommandResult.PASS;
     }
+
+    // Makes sure that the bot is in a voice channel!
+    private boolean joinHelper(Member member, JDA jda) {
+        manager.getOrCreate(member.getGuild().getIdLong());
+
+        final GuildVoiceState memberVoiceState = member.getVoiceState();
+
+        if (memberVoiceState.inAudioChannel()) {
+            jda.getDirectAudioController().connect(memberVoiceState.getChannel());
+            return true;
+        }
+
+        return false;
+    }
 }

src/main/java/org/mangorage/mangobotplugin/commands/music/impl/StopCommand.java

@@ -17,13 +17,16 @@ public StopCommand(IMusicManager manager) {
 
     @Override
     public JDACommandResult run(CommandContext<Message> commandContext) throws Throwable {
+        final var context = commandContext.getContextObject();
         final var guild = commandContext.getContextObject().getGuild();
 
         final var guildManager = manager.getOrCreate(guild.getIdLong());
         final var player = guildManager.getPlayer();
 
         player.ifPresent(lp -> {
-            lp.stopTrack().subscribe();
+            lp.stopTrack().subscribe(plr -> {
+                context.reply("Stopped Current Music Track!").queue();
+            });
         });
 
         return JDACommandResult.PASS;