Jonas_Jones/ZtereoMUSIC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ZtereoMUSIC.git synced 2025-10-26 04:49:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor YouTube interface, make error handling safer

Browse source
This commit is contained in:
Reperak 2021-11-23 21:30:09 -06:00
parent 9cf78e4386
commit d31d36538e
No known key found for this signature in database
GPG key ID: 12F30C9BA6950C0C
2 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java
View file

@ -12,12 +12,14 @@ 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;
@ -55,15 +57,14 @@ public class Play implements Command {
Matcher matchedUrls = urlPattern.matcher(mergedArgs);
boolean urlFound = matchedUrls.find();
// todo: clean up this bullshit try catch thing
String identifier;
if (!urlFound) {
// youtube api shit
try {
identifier = YoutubeSearch.getVideoUrl(mergedArgs);
} catch (IOException e) {
e.printStackTrace();
identifier = "error";
Optional<String> query = YoutubeSearch.query(mergedArgs);
if (query.isPresent()) {
identifier = query.get();
} else {
messageEvent.getChannel().sendMessage("I found no matches for that song!").queue();
return;
}
} else {
// set identifier to the parsed url