From 735d4bc19343b281988a84ed8d9ebaa9d3ca48c5 Mon Sep 17 00:00:00 2001 From: ZtereoHYPE <57519662+ZtereoHYPE@users.noreply.github.com> Date: Fri, 4 Feb 2022 14:30:37 +0100 Subject: [PATCH] change: reformat code because i messed up first time --- .../ztereohype/ztereomusic/ZtereoMUSIC.java | 6 +-- .../audio/CustomAudioLoadResultHandler.java | 2 +- .../ztereomusic/audio/TrackManager.java | 11 ++-- .../ztereomusic/command/commands/Clear.java | 20 +++---- .../command/commands/Disconnect.java | 18 +++---- .../ztereomusic/command/commands/Pause.java | 20 +++---- .../ztereomusic/command/commands/Ping.java | 16 +++--- .../ztereomusic/command/commands/Play.java | 23 ++++---- .../ztereomusic/command/commands/Queue.java | 20 +++---- .../ztereomusic/command/commands/Remove.java | 52 +++++++++---------- .../ztereomusic/command/commands/Skip.java | 20 +++---- .../listeners/CommandListener.java | 12 ++--- .../networking/SpotifyApiHelper.java | 40 +++++++------- 13 files changed, 130 insertions(+), 130 deletions(-) diff --git a/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java b/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java index 4994e29..65183c2 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java +++ b/src/main/java/codes/ztereohype/ztereomusic/ZtereoMUSIC.java @@ -56,9 +56,9 @@ public class ZtereoMUSIC { ztereoMUSIC.setConfig(Config.loadFrom("./config.json5")); ztereoMUSIC.setJda(JDABuilder.createDefault(ztereoMUSIC.getConfig().getPropreties().get("token"), intents) - .enableCache(CacheFlag.VOICE_STATE) - .build() - .awaitReady()); + .enableCache(CacheFlag.VOICE_STATE) + .build() + .awaitReady()); ztereoMUSIC.setupAudio(); ztereoMUSIC.setCommands(); diff --git a/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java b/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java index fc8737b..54c8308 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java +++ b/src/main/java/codes/ztereohype/ztereomusic/audio/CustomAudioLoadResultHandler.java @@ -32,7 +32,7 @@ public class CustomAudioLoadResultHandler implements AudioLoadResultHandler { @Override public void loadFailed(FriendlyException throwable) { this.messageChannel.sendMessage("Failed loading that audio. Try with a different source (eg. YouTube URL)") - .queue(); + .queue(); } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java b/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java index c0959ba..7e4564c 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java +++ b/src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java @@ -18,10 +18,10 @@ import java.util.ArrayList; import java.util.List; public class TrackManager extends AudioEventAdapter { - private final @Getter AudioPlayer player; public final List trackQueue = new ArrayList<>(); - private @Getter @Setter MessageChannel infoChannel; + private final @Getter AudioPlayer player; private final Guild guild; + private @Getter @Setter MessageChannel infoChannel; public TrackManager(AudioPlayerManager playerManager, MessageChannel infoChannel, Guild guild) { this.player = playerManager.createPlayer(); @@ -106,8 +106,8 @@ public class TrackManager extends AudioEventAdapter { } ZtereoMUSIC.getInstance() - .getPlayerManager() - .loadItem(identifier, new CustomAudioLoadResultHandler(this, infoChannel)); + .getPlayerManager() + .loadItem(identifier, new CustomAudioLoadResultHandler(this, infoChannel)); } } @@ -120,7 +120,8 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackException(AudioPlayer player, AudioTrack track, FriendlyException exception) { infoChannel.sendMessage( - "Uh oh, a track did something strange. Ask the owner to check for errors in console. Skpping...").queue(); + "Uh oh, a track did something strange. Ask the owner to check for errors in console. Skpping...") + .queue(); System.out.println(exception.getCause().getMessage()); } diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Clear.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Clear.java index f0a6b45..0880fa2 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Clear.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Clear.java @@ -15,16 +15,16 @@ public class Clear implements Command { public Clear() { this.meta = CommandMeta.builder() - .name("clear") - .aliases(new String[] { "deleteall" }) - .description("Clears the queue and stops playing.") - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.BOT_PLAYING, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("clear") + .aliases(new String[] { "deleteall" }) + .description("Clears the queue and stops playing.") + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.BOT_PLAYING, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public void execute(MessageReceivedEvent messageEvent, String[] args) { diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java index dfc44fd..1b689b8 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Disconnect.java @@ -12,15 +12,15 @@ public class Disconnect implements Command { public Disconnect() { this.meta = CommandMeta.builder() - .name("disconnect") - .description("A command to kick the bot from the vc.") - .aliases(new String[] { "fuckoff", "bye" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("disconnect") + .description("A command to kick the bot from the vc.") + .aliases(new String[] { "fuckoff", "bye" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public CommandMeta getMeta() { diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Pause.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Pause.java index 4d0a1e7..f20a552 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Pause.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Pause.java @@ -14,16 +14,16 @@ public class Pause implements Command { public Pause() { this.meta = CommandMeta.builder() - .name("pause") - .description("Pause the playing music") - .aliases(new String[] { "resume" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.BOT_PLAYING, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("pause") + .description("Pause the playing music") + .aliases(new String[] { "resume" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.BOT_PLAYING, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public CommandMeta getMeta() { diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Ping.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Ping.java index 566b51e..eb3ff2b 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Ping.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Ping.java @@ -10,13 +10,13 @@ public class Ping implements Command { public Ping() { this.meta = CommandMeta.builder() - .name("ping") - .description("A command to get pinged") - .aliases(new String[] { "pong", "pog" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[0]) - .build(); + .name("ping") + .description("A command to get pinged") + .aliases(new String[] { "pong", "pog" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[0]) + .build(); } @Override public CommandMeta getMeta() { @@ -24,7 +24,7 @@ public class Ping implements Command { } public void execute(MessageReceivedEvent messageEvent, String[] args) { - messageEvent.getMessage().reply("get ping'd lolmao").queue(); + messageEvent.getMessage().reply("git ping'd lolmao").queue(); } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java index 5fb9a6c..2e1866b 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Play.java @@ -24,19 +24,19 @@ public class Play implements Command { private static final Pattern URL_PATTERN = Pattern.compile("^(http|https)://([a-z]+\\.[a-z]+)+/\\S+$", Pattern.CASE_INSENSITIVE); private static final Pattern SPOTIFY_URL_PATTERN = Pattern.compile( - "^(?:https://open\\.spotify\\.com/(track|playlist)/)(\\S+(?:\\?si=\\S+))$"); + "^(?:https://open\\.spotify\\.com/(track|playlist)/)(\\S+(?:\\?si=\\S+))$"); private final CommandMeta meta; public Play() { this.meta = CommandMeta.builder() - .name("play") - .description("Play music!") - .aliases(new String[] { "p" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.USER_CONNECTED, VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("play") + .description("Play music!") + .aliases(new String[] { "p" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.USER_CONNECTED, VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public CommandMeta getMeta() { @@ -56,7 +56,8 @@ public class Play implements Command { if (trackManager == null || !trackManager.getPlayer().isPaused()) { messageChannel.sendMessage( - "What should I play? Type the name of the song after the command or use a YouTube link!").queue(); + "What should I play? Type the name of the song after the command or use a YouTube link!") + .queue(); return; } @@ -99,7 +100,7 @@ public class Play implements Command { TrackManager trackManager = TrackManagers.getOrCreateGuildTrackManager(guild, messageChannel, voiceChannel); ZtereoMUSIC.getInstance() - .getPlayerManager() - .loadItem(identifier, new CustomAudioLoadResultHandler(trackManager, messageChannel)); + .getPlayerManager() + .loadItem(identifier, new CustomAudioLoadResultHandler(trackManager, messageChannel)); } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Queue.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Queue.java index 7940331..fb08718 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Queue.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Queue.java @@ -19,15 +19,15 @@ public class Queue implements Command { public Queue() { this.meta = CommandMeta.builder() - .name("queue") - .description("See the queue") - .aliases(new String[] { "q" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("queue") + .description("See the queue") + .aliases(new String[] { "q" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public CommandMeta getMeta() { @@ -37,7 +37,7 @@ public class Queue implements Command { public void execute(MessageReceivedEvent messageEvent, String[] args) { Guild guild = messageEvent.getGuild(); VoiceChannel voiceChannel = Objects.requireNonNull(Objects.requireNonNull(messageEvent.getMember()) - .getVoiceState()).getChannel(); + .getVoiceState()).getChannel(); MessageChannel messageChannel = messageEvent.getChannel(); TrackManager trackManager = TrackManagers.getOrCreateGuildTrackManager(guild, messageChannel, voiceChannel); diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Remove.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Remove.java index b6880ea..78b5179 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Remove.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Remove.java @@ -19,16 +19,28 @@ public class Remove implements Command { public Remove() { this.meta = CommandMeta.builder() - .name("remove") - .aliases(new String[] { "delete" }) - .description("Remove the chosen item.") - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.BOT_PLAYING, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("remove") + .aliases(new String[] { "delete" }) + .description("Remove the chosen item.") + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.BOT_PLAYING, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); + } + + public static boolean isNumeric(String strNum) { + if (strNum == null) { + return false; + } + try { + int i = Integer.parseInt(strNum); + } catch (NumberFormatException nfe) { + return false; + } + return true; } @Override public void execute(MessageReceivedEvent messageEvent, String[] args) { @@ -38,8 +50,8 @@ public class Remove implements Command { // if there's the wrong amount of arguments send the usage if (args.length != 1) { messageChannel.sendMessage( - "Usage: `remove [index of song to remove]/first/last`. Use the `queue` command to find the index.") - .queue(); + "Usage: `remove [index of song to remove]/first/last`. Use the `queue` command to find the index.") + .queue(); return; } @@ -65,8 +77,8 @@ public class Remove implements Command { parsedIndex = indexAliases.get(index); } else { messageChannel.sendMessage( - "Usage: `remove [index of song to remove]/first/last`. Use the `queue` command to find the index.") - .queue(); + "Usage: `remove [index of song to remove]/first/last`. Use the `queue` command to find the index.") + .queue(); return; } @@ -78,16 +90,4 @@ public class Remove implements Command { String title = trackManager.removeQueueItem(parsedIndex - 1); messageChannel.sendMessage("Removed " + title).queue(); } - - public static boolean isNumeric(String strNum) { - if (strNum == null) { - return false; - } - try { - int i = Integer.parseInt(strNum); - } catch (NumberFormatException nfe) { - return false; - } - return true; - } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Skip.java b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Skip.java index 297d812..9ca8fe3 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/command/commands/Skip.java +++ b/src/main/java/codes/ztereohype/ztereomusic/command/commands/Skip.java @@ -15,16 +15,16 @@ public class Skip implements Command { public Skip() { this.meta = CommandMeta.builder() - .name("skip") - .description("Skip the current track!") - .aliases(new String[] { "next" }) - .isNsfw(false) - .isHidden(false) - .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, - VoiceChecks.BOT_PLAYING, - VoiceChecks.USER_CONNECTED, - VoiceChecks.SAME_VC_IF_CONNECTED }) - .build(); + .name("skip") + .description("Skip the current track!") + .aliases(new String[] { "next" }) + .isNsfw(false) + .isHidden(false) + .checks(new VoiceChecks[] { VoiceChecks.BOT_CONNECTED, + VoiceChecks.BOT_PLAYING, + VoiceChecks.USER_CONNECTED, + VoiceChecks.SAME_VC_IF_CONNECTED }) + .build(); } @Override public CommandMeta getMeta() { diff --git a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java index 0ce2fed..625c29d 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java +++ b/src/main/java/codes/ztereohype/ztereomusic/listeners/CommandListener.java @@ -49,9 +49,9 @@ public class CommandListener extends ListenerAdapter { // check if the command is allowed and stop at first failure (order is important) for (VoiceChecks checkEnum : command.getMeta().getChecks()) { if (!checkEnum.getCheck() - .getResult(message.getMember(), - guild.getAudioManager().getConnectedChannel(), - TrackManagers.getGuildTrackManager(guild, messageChannel))) { + .getResult(message.getMember(), + guild.getAudioManager().getConnectedChannel(), + TrackManagers.getGuildTrackManager(guild, messageChannel))) { message.reply(checkEnum.getCheck().getErrorCode()).queue(); return; } @@ -63,9 +63,9 @@ public class CommandListener extends ListenerAdapter { } catch (Exception e) { //todo: nicer embed with error pls message.getChannel() - .sendMessage( - "uh oh something really bad happened and yeah so yeah everything is aborted and cancelled i give up this is too hard kthxbye") - .queue(); + .sendMessage( + "uh oh something really bad happened and yeah so yeah everything is aborted and cancelled i give up this is too hard kthxbye") + .queue(); throw e; } } diff --git a/src/main/java/codes/ztereohype/ztereomusic/networking/SpotifyApiHelper.java b/src/main/java/codes/ztereohype/ztereomusic/networking/SpotifyApiHelper.java index 20cb857..8708096 100644 --- a/src/main/java/codes/ztereohype/ztereomusic/networking/SpotifyApiHelper.java +++ b/src/main/java/codes/ztereohype/ztereomusic/networking/SpotifyApiHelper.java @@ -21,19 +21,17 @@ import java.util.regex.Pattern; public class SpotifyApiHelper { private static final String CLIENT_ID = ZtereoMUSIC.getInstance() - .getConfig() - .getPropreties() - .get("spotify_client_id"); + .getConfig() + .getPropreties() + .get("spotify_client_id"); private static final String CLIENT_SECRET = ZtereoMUSIC.getInstance() - .getConfig() - .getPropreties() - .get("spotify_client_secret"); + .getConfig() + .getPropreties() + .get("spotify_client_secret"); private static final Pattern IDENTIFIER_PATTERN = Pattern.compile( - "(?:(?<=https://open\\.spotify\\.com/track/)|(?<=https://open\\.spotify\\.com/playlist/))(\\S+(?=\\?si=\\S))"); - - private static String spotifyToken; - + "(?:(?<=https://open\\.spotify\\.com/track/)|(?<=https://open\\.spotify\\.com/playlist/))(\\S+(?=\\?si=\\S))"); private static final Json JSON = Json.json(); + private static String spotifyToken; public static void startTokenTimer() { Timer timer = new Timer(); @@ -55,13 +53,13 @@ public class SpotifyApiHelper { @SneakyThrows private static Optional getToken() { HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder(URI.create( - "https://accounts.spotify.com/api/token?grant_type=client_credentials")) - .POST(HttpRequest.BodyPublishers.ofString("")) - .header("Authorization", - "Basic " + Base64.getEncoder() - .encodeToString((CLIENT_ID + ":" + CLIENT_SECRET).getBytes(StandardCharsets.UTF_8.toString()))) - .header("Content-Type", "application/x-www-form-urlencoded") - .build(); + "https://accounts.spotify.com/api/token?grant_type=client_credentials")) + .POST(HttpRequest.BodyPublishers.ofString("")) + .header("Authorization", + "Basic " + Base64.getEncoder() + .encodeToString((CLIENT_ID + ":" + CLIENT_SECRET).getBytes(StandardCharsets.UTF_8.toString()))) + .header("Content-Type", "application/x-www-form-urlencoded") + .build(); JsonPath tokenPath = JsonPath.parse("access_token"); try { @@ -98,10 +96,10 @@ public class SpotifyApiHelper { HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder(URI.create(query)) - .GET() - .header("Authorization", "Bearer " + spotifyToken) - .header("Content-Type", "application/json") - .build(); + .GET() + .header("Authorization", "Bearer " + spotifyToken) + .header("Content-Type", "application/json") + .build(); JsonPath titlePath = JsonPath.parse("tracks[0].name"); // JsonPath authorPath = JsonPath.parse("tracks[0].artists[0].name");