Merge pull request #4 from ReperakDev/handling-refactor

this is very cool and solves many internal conflicts i had by coding that. 


prepare for the next hell incoming when i have more free time lol

src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java

@@ -0,0 +1,40 @@
+package codes.ztereohype.ztereomusic.audio;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+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.api.events.message.MessageReceivedEvent;
+
+public class CustomAudioLoadResultHandler implements AudioLoadResultHandler {
+    private final TrackManager trackManager;
+    private final MessageReceivedEvent messageEvent;
+
+    public CustomAudioLoadResultHandler(TrackManager trackManager, MessageReceivedEvent messageEvent) {
+        this.trackManager = trackManager;
+        this.messageEvent = messageEvent;
+    }
+
+    @Override
+    public void trackLoaded(AudioTrack track) {
+        this.trackManager.queue(track);
+    }
+
+    @Override
+    public void playlistLoaded(AudioPlaylist playlist) {
+        for (AudioTrack track : playlist.getTracks()) {
+            this.trackManager.queue(track);
+        }
+    }
+
+    @Override
+    public void noMatches() {
+        this.messageEvent.getMessage().reply("I found no matches for that song!").queue();
+    }
+
+    @Override
+    public void loadFailed(FriendlyException throwable) {
+        this.messageEvent.getMessage().reply("everything blew up and died. i'm sorry.").queue();
+    }
+}
+

src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java

@@ -1,6 +1,7 @@
 package codes.ztereohype.ztereomusic.command.commands;
 
 import codes.ztereohype.ztereomusic.ZtereoMUSIC;
+import codes.ztereohype.ztereomusic.audio.CustomAudioLoadResultHandler;
 import codes.ztereohype.ztereomusic.audio.TrackManager;
 import codes.ztereohype.ztereomusic.audio.TrackManagers;
 import codes.ztereohype.ztereomusic.command.Command;
@@ -11,16 +12,19 @@ import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.managers.AudioManager;
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class Play implements Command {
+    private static final Pattern URL_PATTERN = Pattern.compile("^(http|https)://([a-z]+\\.[a-z]+)+/\\S+$", Pattern.CASE_INSENSITIVE);
     CommandMeta meta = new CommandMeta("play", "Play music!", new String[]{"p"}, false, false);
 
     @Override
@@ -49,20 +53,17 @@ public class Play implements Command {
 
         // check if args merged are/have url, if so try to feed it into lava, else try to youtube api the fuck out of it.
         String mergedArgs = String.join(" ", args);
-
+        Matcher matchedUrls = URL_PATTERN.matcher(mergedArgs);
-        Pattern urlPattern = Pattern.compile("^(http|https)://([a-z]+\\.[a-z]+)+/\\S+$", Pattern.CASE_INSENSITIVE);
-        Matcher matchedUrls = urlPattern.matcher(mergedArgs);
         boolean urlFound = matchedUrls.find();
 
-        // todo: clean up this bullshit try catch thing
         String identifier;
         if (!urlFound) {
-            // youtube api shit
+            Optional<String> query = YoutubeSearch.query(mergedArgs);
-            try {
+            if (query.isPresent()) {
-                identifier = YoutubeSearch.getVideoUrl(mergedArgs);
+                identifier = query.get();
-            } catch (IOException e) {
+            } else {
-                e.printStackTrace();
+                messageEvent.getChannel().sendMessage("I found no matches for that song!").queue();
-                identifier = "error";
+                return;
             }
         } else {
             // set identifier to the parsed url
@@ -71,28 +72,6 @@ public class Play implements Command {
 
         TrackManager trackManager = TrackManagers.getGuildTrackManager(guild, messageChannel, manager.getConnectedChannel(), voiceChannel);
 
-        playerManager.loadItem(identifier, new AudioLoadResultHandler() {
+        playerManager.loadItem(identifier, new CustomAudioLoadResultHandler(trackManager, messageEvent));
-            @Override
-            public void trackLoaded(AudioTrack track) {
-                trackManager.queue(track);
-            }
-
-            @Override
-            public void playlistLoaded(AudioPlaylist playlist) {
-                for (AudioTrack track : playlist.getTracks()) {
-                    trackManager.queue(track);
-                }
-            }
-
-            @Override
-            public void noMatches() {
-                messageEvent.getMessage().reply("I found no matches for that song!").queue();
-            }
-
-            @Override
-            public void loadFailed(FriendlyException throwable) {
-                messageEvent.getMessage().reply("everything blew up and died. i'm sorry.").queue();
-            }
-        });
     }
 }

src/main/java/codes/ztereohype/ztereomusic/networking/YoutubeSearch.java

@@ -10,32 +10,30 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 
 public class YoutubeSearch {
-    public static String getVideoUrl(String title) throws IOException {
+    private static final String API_KEY = ZtereoMUSIC.getInstance().getConfig().getPropreties().get("yt_api_key");
-        String apiKey = ZtereoMUSIC.getInstance().getConfig().getPropreties().get("yt_api_key");
+    private static final Json JSON = Json.json();
-        String query;
 
-        title = (title.contains(" ")) ? title.replace(" ","+") : title;
+    public static Optional<String> query(String title) {
-        query = "https://www.googleapis.com/youtube/v3/search?part=snippet&q=%22"+title+"%22&type=video&key="+apiKey;
+        String query = "https://www.googleapis.com/youtube/v3/search?part=snippet&q=%22"
+                + title.replace(' ', '+') + "%22&type=video&key=" + API_KEY;
 
-        // todo: add safety here, sounds a bit unsafe to me tbh but idk
+        String jsonResponse;
-        InputStream inputStream = new URL(query).openStream();
-        String jsonResponse = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-
-        //todo: clean up this bullshit try/catch shit and error
-        Json json = Json.json();
-        JsonNode parsedResponse;
-        JsonPath path = JsonPath.parse("items[0].id.videoId");
-        String videoId;
         try {
-            parsedResponse = json.parse(jsonResponse);
+            jsonResponse = new String(new URL(query).openStream().readAllBytes());
-            videoId = parsedResponse.query(path).asString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return Optional.empty();
+        }
+        JsonPath path = JsonPath.parse("items[0].id.videoId");
+
+        try {
+            return Optional.ofNullable(JSON.parse(jsonResponse).query(path).asString());
         } catch (JsonSyntaxException e) {
             e.printStackTrace();
-            videoId = "error";
+            return Optional.empty();
         }
-
-        return videoId;
     }
 }