Merge pull request #3 from bwaggone/feature/remove-listener-adapater-from-main

Feature/remove listener adapater from main

4 files changed, 297 insertions, 238 deletions

diff --git a/src/main/java/soundchan/BotListener.java b/src/main/java/soundchan/BotListener.java
new file mode 100644
index 0000000..8e43ca9
--- /dev/null
+++ b/src/main/java/soundchan/BotListener.java
@@ -0,0 +1,250 @@
+package soundchan;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import net.dv8tion.jda.client.events.call.voice.CallVoiceJoinEvent;
+import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.MessageChannel;
+import net.dv8tion.jda.core.entities.VoiceChannel;
+import net.dv8tion.jda.core.events.guild.voice.GuildVoiceMoveEvent;
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.core.hooks.ListenerAdapter;
+import net.dv8tion.jda.core.managers.AudioManager;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+public class BotListener extends ListenerAdapter{
+
+    private long monitoredGuildId = -1;
+    private Guild monitoredGuild;
+    private static String followingUser;
+    private static String localFilePath;
+    private static LocalAudioManager localManager;
+    private final AudioPlayerManager playerManager;
+    private final Map<Long, GuildMusicManager> musicManagers;
+
+    public BotListener(Properties properties) {
+        this.musicManagers = new HashMap<>();
+
+        this.playerManager = new DefaultAudioPlayerManager();
+        AudioSourceManagers.registerRemoteSources(playerManager);
+        AudioSourceManagers.registerLocalSource(playerManager);
+
+        localFilePath = properties.getProperty("localFilePath");
+        followingUser = properties.getProperty("followingUser");
+        localManager = new LocalAudioManager(localFilePath);
+    }
+
+    private synchronized GuildMusicManager getGuildAudioPlayer() {
+        long guildId = monitoredGuildId;
+        GuildMusicManager musicManager = musicManagers.get(guildId);
+
+        if (musicManager == null) {
+            musicManager = new GuildMusicManager(playerManager);
+            musicManagers.put(guildId, musicManager);
+        }
+
+        monitoredGuild.getAudioManager().setSendingHandler(musicManager.getSendHandler());
+
+        return musicManager;
+    }
+
+    @Override
+    public void onCallVoiceJoin(CallVoiceJoinEvent event){
+
+    }
+
+
+    @Override
+    public void onGuildVoiceMove(GuildVoiceMoveEvent event) {
+        if(event.getMember().getEffectiveName().compareTo(followingUser) == 0) {
+            AudioManager audioManager = monitoredGuild.getAudioManager();
+            if(!audioManager.isAttemptingToConnect()) {
+                audioManager.openAudioConnection(event.getChannelJoined());
+            }
+        }
+        super.onGuildVoiceMove(event);
+    }
+
+    @Override
+    public void onMessageReceived(MessageReceivedEvent event) {
+        String[] command = event.getMessage().getContentRaw().split(" ", 2);
+        BotListenerHelpers helper = new BotListenerHelpers();
+
+        Guild guild = event.getGuild();
+        MessageChannel channel = helper.GetReplyChannel(event);
+
+        // If we haven't set the Monitored Guild yet, set the value
+        if(monitoredGuildId == -1 && guild != null){
+            monitoredGuildId = Long.parseLong(guild.getId());
+            monitoredGuild = guild;
+        }
+
+        if(monitoredGuild != null){
+
+            // "!" Signifies that you're looking to play a sound effect
+            if(command[0].startsWith("!") && command[0].length() > 1){
+                String filepath = localManager.GetFilePath(command[0].substring(1));
+                if(!filepath.contentEquals("")) {
+                    loadAndPlay(channel, filepath);
+                }
+                else{
+                    channel.sendMessage("File \"" + command[0].substring(1) + "\" not found!").queue();
+                }
+            }
+
+            if(command[0].startsWith("~")){
+                switch (Commands.valueOf(command[0].substring(1))){
+                    case play: {
+                        if(command.length == 2)
+                            loadAndPlay(channel, command[1]);
+                        break;
+                    }
+                    case skip: {
+                        skipTrack(channel);
+                        break;
+                    }
+                    case volume: {
+                        if(command.length == 2)
+                            changeVolume(channel, command[1]);
+                        break;
+                    }
+                    case list: {
+                        if(command.length == 2){
+                            if(command[1].equals("queue")){
+                                listTracks(channel);
+                            }
+                            else if(command[1].equals("sounds")){
+                                localManager.ListSounds(channel);
+                            }
+                        }
+                        break;
+                    }
+                    case pause: {
+                        pauseTrack(channel);
+                        break;
+                    }
+                    case unpause: {
+                        unpauseTrack(channel);
+                        break;
+                    }
+                    case playingnow: {
+                        break;
+                    }
+                }
+            }
+
+        }
+
+        super.onMessageReceived(event);
+    }
+
+    private void changeVolume(final MessageChannel channel, final String volume) {
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+        musicManager.player.setVolume(Integer.parseInt(volume));
+        channel.sendMessage("Volume now set to " + volume + "%").queue();
+    }
+
+    private void listTracks(final MessageChannel channel) {
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+        List<String> queueContents = musicManager.scheduler.getQueueContents();
+        String printMessage = "Tracks in the queue:\n";
+        for (String track:
+                queueContents) {
+            printMessage = printMessage + track + "\n";
+        }
+        channel.sendMessage(printMessage).queue();
+    }
+
+    private void pauseTrack(final MessageChannel channel){
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+        musicManager.player.setPaused(true);
+        channel.sendMessage("Playback Paused.").queue();
+    }
+
+    private void unpauseTrack(final MessageChannel channel){
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+        musicManager.player.setPaused(false);
+        channel.sendMessage("Unpaused playback.").queue();
+    }
+
+    private void loadAndPlay(final MessageChannel channel, final String trackUrl) {
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+
+        playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {
+            @Override
+            public void trackLoaded(AudioTrack track) {
+                int timeStart = trackUrl.lastIndexOf('=');
+                if(timeStart != -1){
+                    String timeString = trackUrl.substring(timeStart);
+
+                    //The format will be 1h2m53s, need to parse that into seconds and then call
+                    //track.setPosition(long position)
+
+                }
+                channel.sendMessage("Adding to queue " + track.getInfo().title).queue();
+
+                play(monitoredGuild, musicManager, track);
+            }
+
+            @Override
+            public void playlistLoaded(AudioPlaylist playlist) {
+                AudioTrack firstTrack = playlist.getSelectedTrack();
+
+                if (firstTrack == null) {
+                    firstTrack = playlist.getTracks().get(0);
+                }
+
+                channel.sendMessage("Adding to queue " + firstTrack.getInfo().title + " (first track of playlist " + playlist.getName() + ")").queue();
+
+                play(monitoredGuild, musicManager, firstTrack);
+            }
+
+            @Override
+            public void noMatches() {
+                channel.sendMessage("Nothing found by " + trackUrl).queue();
+            }
+
+            @Override
+            public void loadFailed(FriendlyException exception) {
+                channel.sendMessage("Could not play: " + exception.getMessage()).queue();
+            }
+        });
+    }
+
+    private void play(Guild guild, GuildMusicManager musicManager, AudioTrack track) {
+        connectToFollowingVoiceChannel(guild.getAudioManager());
+
+        musicManager.scheduler.queue(track);
+    }
+
+    private void skipTrack(MessageChannel channel) {
+        GuildMusicManager musicManager = getGuildAudioPlayer();
+        musicManager.scheduler.nextTrack();
+
+        channel.sendMessage("Skipped to next track.").queue();
+    }
+
+
+    private static void connectToFollowingVoiceChannel(AudioManager audioManager) {
+        if (!audioManager.isConnected() && !audioManager.isAttemptingToConnect()) {
+            for (VoiceChannel voiceChannel : audioManager.getGuild().getVoiceChannels()) {
+                for (int i = 0; i < voiceChannel.getMembers().size(); i++) {
+                    if (voiceChannel.getMembers().get(i).getEffectiveName().compareTo(followingUser) == 0) {
+                        audioManager.openAudioConnection(voiceChannel);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/soundchan/BotListenerHelpers.java b/src/main/java/soundchan/BotListenerHelpers.java
new file mode 100644
index 0000000..600e4b0
--- /dev/null
+++ b/src/main/java/soundchan/BotListenerHelpers.java
@@ -0,0 +1,20 @@
+package soundchan;
+
+import net.dv8tion.jda.core.entities.Guild;
+import net.dv8tion.jda.core.entities.MessageChannel;
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+
+public class BotListenerHelpers {
+
+    /**
+     * Given a MessageReceivedEvent, determines the correct reply channel for SoundChan.
+     * @param event a MessageReceivedEvent from the JDA ListenerAdapter
+     * @return Either a PrivateChannel (if SoundChan was DM'd) or a TextChannel (If SoundChan was commanded in one)
+     */
+    public MessageChannel GetReplyChannel(MessageReceivedEvent event){
+        Guild guild = event.getGuild();
+        return (guild == null) ? event.getPrivateChannel() : event.getTextChannel();
+    }
+
+
+}
diff --git a/src/main/java/soundchan/Commands.java b/src/main/java/soundchan/Commands.java
new file mode 100644
index 0000000..3f96d37
--- /dev/null
+++ b/src/main/java/soundchan/Commands.java
@@ -0,0 +1,14 @@
+package soundchan;
+
+/**
+ * An enum representing the possible commands SoundChan might receive
+ */
+public enum Commands {
+    play,
+    volume,
+    pause,
+    unpause,
+    skip,
+    list,
+    playingnow
+}
diff --git a/src/main/java/soundchan/Main.java b/src/main/java/soundchan/Main.java
index 2b34aca..2e666f4 100644
--- a/src/main/java/soundchan/Main.java
+++ b/src/main/java/soundchan/Main.java
@@ -1,30 +1,15 @@
 package soundchan;
 
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
-import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
-import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import net.dv8tion.jda.core.AccountType;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.MessageChannel;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.guild.voice.GuildVoiceMoveEvent;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.client.events.call.voice.CallVoiceJoinEvent;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
-import net.dv8tion.jda.core.managers.AudioManager;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 
-public class Main extends ListenerAdapter {
+public class Main {
   public static void main(String[] args) throws Exception {
 
     Properties properties = LoadProperties();
@@ -34,236 +19,26 @@ public class Main extends ListenerAdapter {
         .buildBlocking();
 
 
-    jda.addEventListener(new Main());
-    localFilePath = properties.getProperty("localFilePath");
-    followingUser = properties.getProperty("followingUser");
-    localManager = new LocalAudioManager(localFilePath);
+    jda.addEventListener(new BotListener(properties));
   }
 
   private static Properties LoadProperties(){
     Properties properties = new Properties();
     InputStream input = null;
-      try{
-        input = new FileInputStream("soundchan.properties");
-        properties.load(input);
-
-      }catch (IOException ex){
+    try{
+      input = new FileInputStream("soundchan.properties");
+      properties.load(input);
+
+    }catch (IOException ex){
+      ex.printStackTrace();
+    } finally {
+      try {
+        input.close();
+      } catch (IOException ex) {
         ex.printStackTrace();
-      } finally {
-        try {
-          input.close();
-        } catch (IOException ex) {
-          ex.printStackTrace();
-        }
-      }
-    return properties;
-  }
-
-  private long monitoredGuildId = -1;
-  private Guild monitoredGuild;
-  private static String followingUser;
-  private static String localFilePath;
-  private static LocalAudioManager localManager;
-  private final AudioPlayerManager playerManager;
-  private final Map<Long, GuildMusicManager> musicManagers;
-
-  private Main() {
-    this.musicManagers = new HashMap<>();
-
-    this.playerManager = new DefaultAudioPlayerManager();
-    AudioSourceManagers.registerRemoteSources(playerManager);
-    AudioSourceManagers.registerLocalSource(playerManager);
-  }
-
-  private synchronized GuildMusicManager getGuildAudioPlayer() {
-    long guildId = monitoredGuildId;
-    GuildMusicManager musicManager = musicManagers.get(guildId);
-
-    if (musicManager == null) {
-      musicManager = new GuildMusicManager(playerManager);
-      musicManagers.put(guildId, musicManager);
-    }
-
-    monitoredGuild.getAudioManager().setSendingHandler(musicManager.getSendHandler());
-
-    return musicManager;
-  }
-
-  @Override
-  public void onCallVoiceJoin(CallVoiceJoinEvent event){
-    
-  }
-
-
-  @Override
-  public void onGuildVoiceMove(GuildVoiceMoveEvent event) {
-    if(event.getMember().getEffectiveName().compareTo(followingUser) == 0) {
-      AudioManager audioManager = monitoredGuild.getAudioManager();
-      if(!audioManager.isAttemptingToConnect()) {
-        audioManager.openAudioConnection(event.getChannelJoined());
       }
     }
-    super.onGuildVoiceMove(event);
-  }
-
-  @Override
-  public void onMessageReceived(MessageReceivedEvent event) {
-    String[] command = event.getMessage().getContentRaw().split(" ", 2);
-    Guild guild = event.getGuild();
-    MessageChannel channel = null;
-
-    // This means SoundChan was DM'd
-    if (guild == null){
-      channel = event.getPrivateChannel();
-    }else{
-      // This means SoundChan was referred to in a TextChannel
-      channel = event.getTextChannel();
-    }
-
-    if(monitoredGuildId == -1 && guild != null){
-      monitoredGuildId = Long.parseLong(guild.getId());
-      monitoredGuild = guild;
-    }
-
-    if(monitoredGuild != null){
-
-      // "!" Signifies that you're looking to play a sound effect
-      if(command[0].startsWith("!") && command[0].length() > 1){
-        String filepath = localManager.GetFilePath(command[0].substring(1));
-        if(!filepath.contentEquals("")) {
-          loadAndPlay(channel, filepath);
-        }
-        else{
-          channel.sendMessage("File \"" + command[0].substring(1) + "\" not found!").queue();
-        }
-      }
-
-      // "~" Signifies that you're looking to play a song/sound from a url
-      if(command[0].startsWith("~") && command[0].length() > 1){
-        if ("~play".equals(command[0]) && command.length == 2) {
-            loadAndPlay(channel, command[1]);
-        } else if ("~skip".equals(command[0])) {
-            skipTrack(channel);
-        } else if ("~volume".equals(command[0]) && command.length == 2) {
-            changeVolume(channel, command[1]);
-        } else if ("~pause".equals(command[0])) {
-            pauseTrack(channel);
-        } else if ("~unpause".equals(command[0])) {
-            unpauseTrack(channel);
-        } else if ("~list".equals(command[0])) {
-          if(command.length == 2){
-            if(command[1].equals("queue")){
-              listTracks(channel);
-            }
-            else if(command[1].equals("sounds")){
-                localManager.ListSounds(channel);
-            }
-          }
-        }
-      }
-
-    }
-
-    super.onMessageReceived(event);
-  }
-
-  private void changeVolume(final MessageChannel channel, final String volume) {
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-    musicManager.player.setVolume(Integer.parseInt(volume));
-    channel.sendMessage("Volume now set to " + volume + "%").queue();
-  }
-
-  private void listTracks(final MessageChannel channel) {
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-    List<String> queueContents = musicManager.scheduler.getQueueContents();
-    String printMessage = "Tracks in the queue:\n";
-    for (String track:
-         queueContents) {
-      printMessage = printMessage + track + "\n";
-    }
-    channel.sendMessage(printMessage).queue();
-  }
-
-  private void pauseTrack(final MessageChannel channel){
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-    musicManager.player.setPaused(true);
-    channel.sendMessage("Playback Paused.").queue();
-  }
-
-  private void unpauseTrack(final MessageChannel channel){
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-    musicManager.player.setPaused(false);
-    channel.sendMessage("Unpaused playback.").queue();
-  }
-
-  private void loadAndPlay(final MessageChannel channel, final String trackUrl) {
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-
-    playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {
-      @Override
-      public void trackLoaded(AudioTrack track) {
-        int timeStart = trackUrl.lastIndexOf('=');
-        if(timeStart != -1){
-          String timeString = trackUrl.substring(timeStart);
-
-          //The format will be 1h2m53s, need to parse that into seconds and then call
-          //track.setPosition(long position)
-
-        }
-        channel.sendMessage("Adding to queue " + track.getInfo().title).queue();
-
-        play(monitoredGuild, musicManager, track);
-      }
-
-      @Override
-      public void playlistLoaded(AudioPlaylist playlist) {
-        AudioTrack firstTrack = playlist.getSelectedTrack();
-
-        if (firstTrack == null) {
-          firstTrack = playlist.getTracks().get(0);
-        }
-
-        channel.sendMessage("Adding to queue " + firstTrack.getInfo().title + " (first track of playlist " + playlist.getName() + ")").queue();
-
-        play(monitoredGuild, musicManager, firstTrack);
-      }
-
-      @Override
-      public void noMatches() {
-        channel.sendMessage("Nothing found by " + trackUrl).queue();
-      }
-
-      @Override
-      public void loadFailed(FriendlyException exception) {
-        channel.sendMessage("Could not play: " + exception.getMessage()).queue();
-      }
-    });
-  }
-
-  private void play(Guild guild, GuildMusicManager musicManager, AudioTrack track) {
-    connectToFollowingVoiceChannel(guild.getAudioManager());
-
-    musicManager.scheduler.queue(track);
-  }
-
-  private void skipTrack(MessageChannel channel) {
-    GuildMusicManager musicManager = getGuildAudioPlayer();
-    musicManager.scheduler.nextTrack();
-
-    channel.sendMessage("Skipped to next track.").queue();
+    return properties;
   }
 
-
-  private static void connectToFollowingVoiceChannel(AudioManager audioManager) {
-    if (!audioManager.isConnected() && !audioManager.isAttemptingToConnect()) {
-      for (VoiceChannel voiceChannel : audioManager.getGuild().getVoiceChannels()) {
-        for(int i = 0; i < voiceChannel.getMembers().size(); i++) {
-          if(voiceChannel.getMembers().get(i).getEffectiveName().compareTo(followingUser) == 0) {
-            audioManager.openAudioConnection(voiceChannel);
-            break;
-          }
-        }
-      }
-    }
-  }
 }