diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/audio/Music.java | 6 | ||||
| -rw-r--r-- | src/main/java/utility/URLChecker.java | 3 | ||||
| -rw-r--r-- | src/main/java/utility/WebAPI.java | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/audio/Music.java b/src/main/java/audio/Music.java index 999c3f3..222c211 100644 --- a/src/main/java/audio/Music.java +++ b/src/main/java/audio/Music.java @@ -268,9 +268,13 @@ public class Music extends ListenerAdapter { event.getHook().sendMessage("Text Playlist Detected! Queueing " + urls.length + " songs").queue();
}
for (String url : urls) {
- loadAndPlay((TextChannel) event.getChannel(), url, false);
+ loadAndPlay((TextChannel) event.getChannel(), url, true);
}
break;
+ case "search-term":
+ event.reply("Searching for: " + userQuery).queue();
+ loadAndPlay((TextChannel) event.getChannel(), youtubeAPI.returnTopVideoURL(userQuery), false);
+ break;
default:
System.out.println(urlCheck.getURLType(userQuery) + " was not handled");
event.reply("Trying to directly queue URL: " + userQuery).queue();
diff --git a/src/main/java/utility/URLChecker.java b/src/main/java/utility/URLChecker.java index 99eb651..e6a54c7 100644 --- a/src/main/java/utility/URLChecker.java +++ b/src/main/java/utility/URLChecker.java @@ -5,6 +5,9 @@ public class URLChecker { return term.matches("^(http|https)://.*");
}
public String getURLType(String url) {
+ if(!url.matches("^(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]\n")){
+ return "search-term";
+ }
if(url.matches("^((?:https?:)?\\/\\/)?((?:www|m)\\.)?youtube\\.com\\/playlist\\?list=([\\w\\-]+)$")){
System.out.println("yt-playlist");
return "yt-playlist";
diff --git a/src/main/java/utility/WebAPI.java b/src/main/java/utility/WebAPI.java index 9724760..86b7312 100644 --- a/src/main/java/utility/WebAPI.java +++ b/src/main/java/utility/WebAPI.java @@ -1,7 +1,4 @@ package utility; -import org.json.JSONArray; -import org.json.JSONObject; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; |