From 072cd9c7a6bd499e894ef6d546effa3ab420fdeb Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 19 Jan 2020 18:10:20 +0100 Subject: [PATCH 01/55] LastTrack yo --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index c5710fe..db3a475 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -20,6 +20,7 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final AudioManager manager; private final Queue queue; + AudioTrack lastTrack; private boolean loop = false; public TrackManager(AudioPlayer player, AudioManager manager) { @@ -51,8 +52,9 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { Guild g = queue.poll().getAuthor().getGuild(); + this.lastTrack = track; if (loop) { - player.playTrack(track.makeClone()); + player.playTrack(lastTrack.makeClone()); } else if (queue.isEmpty()) { manager.players.remove(g.getId()); manager.getPlayer(g).destroy(); From 46960abbbeb4d9915e178146f288f6ff61091502 Mon Sep 17 00:00:00 2001 From: Hax Date: Mon, 20 Jan 2020 17:54:07 +0100 Subject: [PATCH 02/55] Improved Database Performance --- src/main/java/com/bbn/hadder/Rethink.java | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index f51814e..6191dff 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -62,6 +62,10 @@ public class Rethink { else return null; } + public Object getByID(String table, String wherevalue, String column) { + return r.table(table).get(wherevalue).getField(column).run(conn); + } + public void update(String table, String where, String what, String value) { try { r.table(table).get(where).update(r.hashMap(what, value)).run(conn); @@ -126,7 +130,7 @@ public class Rethink { } public String getUserPrefix(String id) { - return (String) this.get("user", "id", id, "prefix"); + return (String) this.getByID("user", id, "prefix"); } public void setGuildPrefix(String prefix, String guild_id) { @@ -134,7 +138,7 @@ public class Rethink { } public String getGuildPrefix(String id) { - return (String) this.get("server", "id", id, "prefix"); + return (String) this.getByID("server", id, "prefix"); } public void insertGuild(String id) { @@ -162,7 +166,7 @@ public class Rethink { } public String getBlackListed(String id) { - return (String) this.get("user", "id", id, "blacklisted"); + return (String) this.getByID("user", id, "blacklisted"); } public void setNeededStars(String stars, String guild_id) { @@ -170,7 +174,7 @@ public class Rethink { } public String getNeededStars(String guild_id) { - return (String) this.get("server", "id", guild_id, "neededstars"); + return (String) this.getByID("server", guild_id, "neededstars"); } public void setStarboardChannel(String guild_id, String channel_id) { @@ -178,11 +182,11 @@ public class Rethink { } public String getStarboardChannel(String guild_id) { - return (String) this.get("server", "id", guild_id, "starboard"); + return (String) this.getByID("server", guild_id, "starboard"); } public boolean hasStarboardChannel(String guild_id) { - return !this.get("server", "id", guild_id, "starboard").equals(""); + return !this.getByID("server", guild_id, "starboard").equals(""); } public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { @@ -190,7 +194,7 @@ public class Rethink { } public String getStarboardMessage(String message_id) { - return (String) this.get("stars", "id", message_id, "starboardmsg"); + return (String) this.getByID("stars", message_id, "starboardmsg"); } public void removeStarboardMessage(String message_id) { @@ -198,7 +202,7 @@ public class Rethink { } public boolean hasStarboardMessage(String message_id) { - return this.get("stars", "id", message_id, "guild") != null; + return this.getByID("stars", message_id, "guild") != null; } public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) { @@ -209,19 +213,19 @@ public class Rethink { } public String getRulesMID(String guild_id) { - return (String) this.get("server", "id", guild_id, "message_id"); + return (String) this.getByID("server", guild_id, "message_id"); } public String getRulesRID(String guild_id) { - return (String) this.get("server", "id", guild_id, "role_id"); + return (String) this.getByID("server", guild_id, "role_id"); } public String getRulesAEmote(String guild_id) { - return (String) this.get("server", "id", guild_id, "accept_emote"); + return (String) this.getByID("server", guild_id, "accept_emote"); } public String getRulesDEmote(String guild_id) { - return (String) this.get("server", "id", guild_id, "decline_emote"); + return (String) this.getByID("server", guild_id, "decline_emote"); } public void setInviteDetection(String guild_id, boolean b) { @@ -229,7 +233,7 @@ public class Rethink { } public Boolean getInviteDetection(String guild_id) { - return (Boolean) this.get("server", "id", guild_id, "invite_detect"); + return (Boolean) this.getByID("server", guild_id, "invite_detect"); } public void setLanguage(String user_id, String language) { @@ -237,7 +241,7 @@ public class Rethink { } public String getLanguage(String user_id) { - return (String) this.get("user", "id", user_id, "language"); + return (String) this.getByID("user", user_id, "language"); } } From 949ad0acf00459d6cee61374e2a7ec654310e15b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 17:58:18 +0100 Subject: [PATCH 03/55] Change invite code --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dca2500..a5d1924 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,7 @@ further defined and clarified by project maintainers. ### Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team on [Discord](https://discordapp.com/invite/Vf4zCYn). All +reported by contacting the project team on [Discord](https://discordapp.com/invite/58My2dM). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. From 6b09db43d9f2f32a782b8ee543282b8e959f3b8d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 18:16:05 +0100 Subject: [PATCH 04/55] More error msgs --- .../hadder/commands/fun/AvatarCommand.java | 41 +++++++++++-------- .../Translations/Translations_en.properties | 2 + 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index e251c95..f2ac8fe 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -1,13 +1,14 @@ package com.bbn.hadder.commands.fun; -/* - * @author Skidder / GregTCLTK - */ - import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.User; + +/** + * @author Skidder / GregTCLTK + */ public class AvatarCommand implements Command { @@ -37,18 +38,26 @@ public class AvatarCommand implements Command { .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); - } else if (args[0].length() == 18){ - Member member = event.getGuild().getMemberById(args[0]); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.fun.avatar.success.title", - member.getUser().getAsTag(), - "", - "") - .setImage(member.getUser().getAvatarUrl()) - .setFooter(member.getUser().getAsTag()) - .build()).queue(); + } else if (args[0].length() == 18) { + try { + User u = event.getGuild().getMemberById(args[0]).getUser(); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.fun.avatar.success.title", + u.getAsTag(), + "", + "") + .setImage(u.getAvatarUrl()) + .setFooter(u.getAsTag()) + .build()).queue(); + } catch (NullPointerException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.fun.avatar.error.title", + "commands.fun.avatar.error.description" + ).build()).queue(); + } + } else { event.getHelpCommand().sendHelp(this, event); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 5ca0715..53ffd50 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -9,6 +9,8 @@ none = None success\! = Success\! commands.fun.avatar.success.title = Avatar of %extra% +commands.fun.avatar.error.title = User not found +commands.fun.avatar.error.description = I can not find a user with this id! commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Looks for a GIF on Giphy. From 607d633d7f7bb3fbe681cc131b823a034f3fea2b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 18:37:05 +0100 Subject: [PATCH 05/55] Rename event to e --- .../java/com/bbn/hadder/commands/Command.java | 2 +- .../hadder/commands/fun/AvatarCommand.java | 28 +-- .../bbn/hadder/commands/fun/ClydeCommand.java | 28 +-- .../bbn/hadder/commands/fun/GifCommand.java | 14 +- .../bbn/hadder/commands/fun/MemeCommand.java | 13 +- .../hadder/commands/general/AboutCommand.java | 8 +- .../commands/general/EqualsCommand.java | 34 ++-- .../hadder/commands/general/HelpCommand.java | 32 ++-- .../commands/general/InviteCommand.java | 6 +- .../hadder/commands/general/PingCommand.java | 4 +- .../hadder/commands/misc/FeedbackCommand.java | 32 ++-- .../hadder/commands/misc/GitHubCommand.java | 40 ++--- .../commands/misc/ScreenShareCommand.java | 48 ++--- .../commands/moderation/BanCommand.java | 58 +++---- .../commands/moderation/ClearCommand.java | 42 ++--- .../commands/moderation/EditRulesCommand.java | 58 +++---- .../moderation/InviteDetectCommand.java | 24 +-- .../commands/moderation/KickCommand.java | 52 +++--- .../commands/moderation/NickCommand.java | 72 ++++---- .../commands/moderation/PrefixCommand.java | 12 +- .../moderation/RegionChangeCommand.java | 60 +++---- .../commands/moderation/RoleCommand.java | 58 +++---- .../commands/moderation/RulesCommand.java | 164 +++++++++--------- .../commands/moderation/StarboardCommand.java | 18 +- .../hadder/commands/music/BassCommand.java | 16 +- .../hadder/commands/music/InfoCommand.java | 12 +- .../hadder/commands/music/JoinCommand.java | 38 ++-- .../hadder/commands/music/LeaveCommand.java | 14 +- .../hadder/commands/music/LoopCommand.java | 20 +-- .../hadder/commands/music/PauseCommand.java | 18 +- .../hadder/commands/music/PlayCommand.java | 32 ++-- .../hadder/commands/music/QueueCommand.java | 14 +- .../hadder/commands/music/SkipCommand.java | 14 +- .../hadder/commands/music/StopCommand.java | 20 +-- .../hadder/commands/music/VolumeCommand.java | 26 ++- .../bbn/hadder/commands/nsfw/AnalCommand.java | 14 +- .../bbn/hadder/commands/nsfw/BDSMCommand.java | 14 +- .../hadder/commands/nsfw/BlowjobCommand.java | 14 +- .../hadder/commands/nsfw/BoobsCommand.java | 14 +- .../bbn/hadder/commands/nsfw/CumCommand.java | 14 +- .../hadder/commands/nsfw/EroticCommand.java | 14 +- .../bbn/hadder/commands/nsfw/FeetCommand.java | 14 +- .../commands/nsfw/FingeringCommand.java | 14 +- .../hadder/commands/nsfw/LickingCommand.java | 14 +- .../bbn/hadder/commands/nsfw/PornCommand.java | 14 +- .../hadder/commands/nsfw/PussyCommand.java | 14 +- .../commands/nsfw/RandomPornCommand.java | 18 +- .../bbn/hadder/commands/nsfw/SoloCommand.java | 14 +- .../hadder/commands/nsfw/SpankCommand.java | 16 +- .../hadder/commands/nsfw/TransCommand.java | 16 +- .../commands/owner/BlacklistCommand.java | 36 ++-- .../hadder/commands/owner/EvalCommand.java | 40 ++--- .../commands/owner/GuildLeaveCommand.java | 14 +- .../hadder/commands/owner/RebootCommand.java | 2 +- .../commands/owner/ShutdownCommand.java | 6 +- .../hadder/commands/owner/TestCommand.java | 4 +- .../commands/settings/LanguageCommand.java | 26 +-- .../commands/settings/UserPrefixCommand.java | 10 +- .../bbn/hadder/listener/CommandListener.java | 16 +- .../bbn/hadder/listener/GuildListener.java | 44 ++--- .../hadder/listener/InviteLinkListener.java | 24 +-- .../bbn/hadder/listener/MentionListener.java | 26 +-- .../listener/PrivateMessageListener.java | 24 +-- .../bbn/hadder/listener/ReadyListener.java | 8 +- .../bbn/hadder/listener/RulesListener.java | 46 ++--- .../hadder/listener/StarboardListener.java | 36 ++-- .../hadder/listener/VoiceLeaveListener.java | 12 +- 67 files changed, 861 insertions(+), 862 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/com/bbn/hadder/commands/Command.java index 83132c0..23f7562 100644 --- a/src/main/java/com/bbn/hadder/commands/Command.java +++ b/src/main/java/com/bbn/hadder/commands/Command.java @@ -5,7 +5,7 @@ package com.bbn.hadder.commands; */ public interface Command { - void executed(String[] args, CommandEvent event); + void executed(String[] args, CommandEvent e); String[] labels(); diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index f2ac8fe..f3c0d76 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -13,11 +13,11 @@ import net.dv8tion.jda.api.entities.User; public class AvatarCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 0) { - Member member = event.getMember(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + Member member = e.getMember(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.fun.avatar.success.title", member.getUser().getAsTag(), @@ -26,10 +26,10 @@ public class AvatarCommand implements Command { .setImage(member.getUser().getAvatarUrl()) .setFooter(member.getUser().getAsTag()) .build()).queue(); - } else if (event.getMessage().getMentionedMembers().size() == 1) { - Member member = event.getMessage().getMentionedMembers().get(0); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } else if (e.getMessage().getMentionedMembers().size() == 1) { + Member member = e.getMessage().getMentionedMembers().get(0); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.fun.avatar.success.title", member.getUser().getAsTag(), @@ -40,9 +40,9 @@ public class AvatarCommand implements Command { .build()).queue(); } else if (args[0].length() == 18) { try { - User u = event.getGuild().getMemberById(args[0]).getUser(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + User u = e.getGuild().getMemberById(args[0]).getUser(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.fun.avatar.success.title", u.getAsTag(), @@ -51,15 +51,15 @@ public class AvatarCommand implements Command { .setImage(u.getAvatarUrl()) .setFooter(u.getAsTag()) .build()).queue(); - } catch (NullPointerException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + } catch (NullPointerException ignore) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.fun.avatar.error.title", "commands.fun.avatar.error.description" ).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index 26d9070..cce4d03 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -24,13 +24,13 @@ import java.util.concurrent.TimeUnit; public class ClydeCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { - TextChannel channel = event.getMessage().getTextChannel(); - String content = event.getMessage().getContentRaw().replace(event.getRethink().getGuildPrefix(event.getGuild().getId()), "").replace(event.getRethink().getUserPrefix(event.getAuthor().getId()), "").replace("clyde", ""); + if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { + TextChannel channel = e.getMessage().getTextChannel(); + String content = e.getMessage().getContentRaw().replace(e.getRethink().getGuildPrefix(e.getGuild().getId()), "").replace(e.getRethink().getUserPrefix(e.getAuthor().getId()), "").replace("clyde", ""); - Webhook webhook = channel.createWebhook(event.getConfig().getClydeName()).complete(); + Webhook webhook = channel.createWebhook(e.getConfig().getClydeName()).complete(); try { InputStream s = new URL("https://discordapp.com/assets/f78426a064bc9dd24847519259bc42af.png").openStream(); webhook.getManager().setAvatar(Icon.from(s)).queue(); @@ -40,24 +40,24 @@ public class ClydeCommand implements Command { WebhookClient client = builder.build(); try { TimeUnit.SECONDS.sleep(1); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ex) { + ex.printStackTrace(); } client.send(content); - } catch (Exception e) { - e.printStackTrace(); + } catch (Exception ex) { + ex.printStackTrace(); } try { TimeUnit.SECONDS.sleep(2); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ex) { + ex.printStackTrace(); } webhook.delete().queue(); - event.getMessage().delete().queue(); + e.getMessage().delete().queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event); + } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index 78d70fd..a63080e 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -18,7 +18,7 @@ import java.util.Random; public class GifCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { StringBuilder query = new StringBuilder(); for (String arg : args) { @@ -27,7 +27,7 @@ public class GifCommand implements Command { } OkHttpClient client = new OkHttpClient(); - Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + event.getConfig().getGiphyToken()).build(); + Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + e.getConfig().getGiphyToken()).build(); try { Random rand = new Random(); Response response = client.newCall(request).execute(); @@ -35,15 +35,15 @@ public class GifCommand implements Command { JSONArray array = json.getJSONArray("data"); int gifIndex = rand.nextInt(array.length()); String url = array.getJSONObject(gifIndex).get("url").toString(); - event.getTextChannel().sendMessage(url).queue(); - } catch (Exception e) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(url).queue(); + } catch (Exception ignore) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "error", "commands.fun.gif.error.description").build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event); + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java index b9c3e0c..9771ab9 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java @@ -18,7 +18,7 @@ import java.io.IOException; public class MemeCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build(); @@ -27,16 +27,15 @@ public class MemeCommand implements Command { Response response = client.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); String url = json.getString("url"); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.fun.meme.success.title", "") .setImage(url) .setAuthor("Subreddit: " + json.getString("subreddit")) .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } catch (IOException ignore) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "error", "commands.fun.meme.api.error") diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java index be5d20d..5584911 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -11,13 +11,13 @@ import com.bbn.hadder.utils.MessageEditor; public class AboutCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.general.about.success.title", "commands.general.about.success.description") - .addField(event.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), event.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", ""), true) + .addField(e.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), e.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + e.getAuthor().getId() + "). :smiley:", ""), true) .setThumbnail("https://bigbotnetwork.com/images/Hadder.png") .build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index e3380f5..01cd919 100644 --- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -12,30 +12,30 @@ import com.bbn.hadder.utils.MessageEditor; public class EqualsCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.general.equals.string.first.request", "") .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent -> { - String firstString = msgevent.getMessage().getContentRaw(); - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + new EventWaiter().newOnMessageEventWaiter(msge -> { + String firstString = msge.getMessage().getContentRaw(); + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.general.equals.string.second.request", "").build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent2 -> { - String secondString = msgevent2.getMessage().getContentRaw(); - event.getChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setTitle((firstString.equals(secondString)) ? event.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : event.getMessageEditor().getTerm( "commands.general.equals.string.equals.false")) - .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false) - .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false) - .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false) + new EventWaiter().newOnMessageEventWaiter(msge2 -> { + String secondString = msge2.getMessage().getContentRaw(); + e.getChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setTitle((firstString.equals(secondString)) ? e.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : e.getMessageEditor().getTerm( "commands.general.equals.string.equals.false")) + .addField(e.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false) + .addField(e.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false) + .addField(e.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false) .build()).queue(); - }, event.getJDA(), event.getAuthor()); - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); + }, e.getJDA(), e.getAuthor()); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 7322465..697d51d 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -13,11 +13,11 @@ import java.util.Map; public class HelpCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { + public void executed(String[] args, CommandEvent e) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { if (args.length == 0) { HashMap> hashMap = new HashMap<>(); - for (Command cmd : event.getCommandHandler().getCommandList()) { + for (Command cmd : e.getCommandHandler().getCommandList()) { if (!hashMap.containsKey(cmd.getClass().getPackageName())) { ArrayList cmdlist = new ArrayList<>(); cmdlist.add(cmd); @@ -28,8 +28,8 @@ public class HelpCommand implements Command { } EmbedBuilder eb = new EmbedBuilder(); for (Map.Entry> entry : hashMap.entrySet()) { - if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") || - event.getAuthor().getId().equals("261083609148948488")))) { + if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (e.getAuthor().getId().equals("477141528981012511") || + e.getAuthor().getId().equals("261083609148948488")))) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < entry.getValue().size(); i++) { Command cmd = entry.getValue().get(i); @@ -40,35 +40,35 @@ public class HelpCommand implements Command { eb.addField(ps[ps.length - 1], sb.toString(), false); } } - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO); - event.getChannel().sendMessage(eb.build()).queue(); + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO); + e.getChannel().sendMessage(eb.build()).queue(); } else { - for (Command cmd : event.getCommandHandler().getCommandList()) { + for (Command cmd : e.getCommandHandler().getCommandList()) { for (String label : cmd.labels()) { if (label.equalsIgnoreCase(args[0])) { - sendHelp(cmd, event); + sendHelp(cmd, e); } } } } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getTerm("commands.general.help.error.description")).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getTerm("commands.general.help.error.description")).queue(); } } - public void sendHelp(Command cmd, CommandEvent event) { + public void sendHelp(Command cmd, CommandEvent e) { if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") && - (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) { + (e.getAuthor().getId().equals("477141528981012511") || e.getAuthor().getId().equals("261083609148948488")))) { String name = cmd.labels()[0]; StringBuilder b = new StringBuilder(); - b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n"); + b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n"); if (cmd.usage() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n"); + b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getRethink().getGuildPrefix(e.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n"); } if (cmd.example() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.example()); + b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getRethink().getGuildPrefix(e.getGuild().getId())).append(name).append(" ").append(cmd.example()); } - event.getChannel().sendMessage(event.getMessageEditor().getMessage( + e.getChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO) .setTitle(cmd.labels()[0]) .setDescription(b.toString()) diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 8d5a65c..7fc1ff0 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -12,9 +12,9 @@ import com.bbn.hadder.utils.MessageEditor; public class InviteCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.general.invite.success.title", "", diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index 09d2ebe..b9f301e 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -11,8 +11,8 @@ import com.bbn.hadder.utils.MessageEditor; public class PingCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(event.getMessageEditor() + public void executed(String[] args, CommandEvent e) { + e.getJDA().getRestPing().queue(ping -> e.getTextChannel().sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO) .setTitle("Ping") .setDescription(String.valueOf(ping)) diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java index fb8cc4f..c354272 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -17,39 +17,39 @@ import java.io.IOException; public class FeedbackCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.feedback.title.request.title", "commands.misc.feedback.title.request.description") .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(event1 -> { - String title = event1.getMessage().getContentDisplay(); - event1.getChannel().sendMessage(event.getMessageEditor().getMessage( + new EventWaiter().newOnMessageEventWaiter(e1 -> { + String title = e1.getMessage().getContentDisplay(); + e1.getChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.feedback.description.request.title", "commands.misc.feedback.description.request.description") .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(event2 -> { - String description = event2.getMessage().getContentDisplay(); + new EventWaiter().newOnMessageEventWaiter(e2 -> { + String description = e2.getMessage().getContentDisplay(); try { - GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken()); + GitHub connection = GitHub.connectUsingOAuth(e.getConfig().getGitHubToken()); GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder"); - GHIssue issue = Hadder.createIssue(title).body("Feedback by " + event.getAuthor().getAsTag() + "
" + description).label("feedback").create(); + GHIssue issue = Hadder.createIssue(title).body("Feedback by " + e.getAuthor().getAsTag() + "
" + description).label("feedback").create(); issue.addLabels("feedback"); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.feedback.success.title", "") .setDescription(issue.getHtmlUrl().toString()) .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } - }, event.getJDA(), event.getAuthor()); - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); + }, e.getJDA(), e.getAuthor()); } diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 8c1ffd6..84fb9c8 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -18,11 +18,11 @@ import java.io.IOException; public class GitHubCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { if (args[0].equals("link")) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.github.link.title", "") @@ -51,39 +51,39 @@ public class GitHubCommand implements Command { if (!json.getString("blog").equals("")) website = json.getString("blog"); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png") .setThumbnail(json.getString("avatar_url")) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true) - .addField(event.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true) + .addField(e.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true) .build()).queue(); - } catch (IOException | NullPointerException e) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } catch (IOException | NullPointerException ex) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.misc.github.api.error.title", "commands.misc.github.api.error.description") .build() ).queue(); - } catch (JSONException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + } catch (JSONException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.misc.github.user.error.title", "commands.misc.github.user.error.description").build()).queue(); } } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); /* TODO: THIS - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.github.connect.title", "", diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index 8f13cc5..fa4ae3a 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -14,52 +14,52 @@ import java.util.List; public class ScreenShareCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length>0) { if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) { - if (event.getGuild().getVoiceChannelById(args[0]) != null) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage( + if (e.getGuild().getVoiceChannelById(args[0]) != null) { + e.getChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + args[0] + "/").build()).queue(); + .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + args[0] + "/").build()).queue(); } else { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue(); - event.getHelpCommand().sendHelp(this, event); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue(); + e.getHelpCommand().sendHelp(this, e); } } else { - List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); + List vcs = e.getGuild().getVoiceChannelsByName(String.join(" ", args), true); if (vcs.size() > 1) { - EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description"); + EmbedBuilder eb = e.getMessageEditor().getMessage(MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description"); for (int i = 0; i < vcs.size(); i++) { VoiceChannel voiceChannel = vcs.get(i); eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false); } - event.getChannel().sendMessage(eb.build()).queue(); - new EventWaiter().newOnMessageEventWaiter(msgevent -> { + e.getChannel().sendMessage(eb.build()).queue(); + new EventWaiter().newOnMessageEventWaiter(msge -> { try { - int i = Integer.parseInt(msgevent.getMessage().getContentRaw()); + int i = Integer.parseInt(msge.getMessage().getContentRaw()); if (vcs.size() > i) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") + .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue(); } else { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue(); - event.getHelpCommand().sendHelp(this, event); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue(); + e.getHelpCommand().sendHelp(this, e); } - } catch (NumberFormatException e) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue(); - event.getHelpCommand().sendHelp(this, event); + } catch (NumberFormatException ex) { + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue(); + e.getHelpCommand().sendHelp(this, e); } - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else if (vcs.size()==0) { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue(); - event.getHelpCommand().sendHelp(this, event); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue(); + e.getHelpCommand().sendHelp(this, e); } else { - event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") - .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "") + .setDescription("http://discordapp.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue(); } } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 98feb04..86a5332 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -15,68 +15,68 @@ import net.dv8tion.jda.api.entities.Member; public class BanCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMessage().getMentionedMembers().size() == 1) { - Member victim = event.getMessage().getMentionedMembers().get(0); - if (!event.getAuthor().getId().equals(victim.getId())) { - if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { - if (event.getGuild().getSelfMember().canInteract(victim)) { - event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getMessage().getMentionedMembers().size() == 1) { + Member victim = e.getMessage().getMentionedMembers().get(0); + if (!e.getAuthor().getId().equals(victim.getId())) { + if (!e.getJDA().getSelfUser().getId().equals(victim.getId())) { + if (e.getGuild().getSelfMember().canInteract(victim)) { + e.getGuild().ban(victim, 0, "Banned by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.ban.success.title", "", "commands.moderation.ban.success.description", victim.getUser().getName() + ".").build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.ban.error.title", "commands.moderation.ban.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage - (event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage + (e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.ban.error.title", "commands.moderation.ban.yourself.error.description").build()).queue(); } - } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event); - } else if (event.getMessage().getMentionedMembers().size() > 1) { - for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { - Member member = event.getMessage().getMentionedMembers().get(i); - if (!event.getAuthor().getId().equals(member.getId())) { - if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { - if (event.getGuild().getSelfMember().canInteract(member)) { - event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue(); + } else if (e.getMessage().getMentionedMembers().size() == 0) { + e.getHelpCommand().sendHelp(this, e); + } else if (e.getMessage().getMentionedMembers().size() > 1) { + for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { + Member member = e.getMessage().getMentionedMembers().get(i); + if (!e.getAuthor().getId().equals(member.getId())) { + if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { + if (e.getGuild().getSelfMember().canInteract(member)) { + e.getGuild().ban(member, 0).reason("Mass Ban by " + e.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.ban.error.title", "commands.moderation.ban.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.ban.error.title", "commands.moderation.ban.yourself.error.description").build()).queue(); } } - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.ban.success.title", "", "commands.moderation.ban.massban.success.description", - String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue(); + String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 12d1a58..9f04cd0 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -20,15 +20,15 @@ import java.util.concurrent.TimeUnit; public class ClearCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) { if (args[0].equals("all")) { - List msg = event.getTextChannel().getIterableHistory().complete(); + List msg = e.getTextChannel().getIterableHistory().complete(); for (Message message : msg) { message.delete().queue(); } - Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + Message message = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.clear.all.success.title", "", @@ -37,51 +37,51 @@ public class ClearCommand implements Command { .build()).complete(); try { TimeUnit.SECONDS.sleep(3); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ex) { + ex.printStackTrace(); } message.delete().queue(); } else { try { int nbToDelete = Integer.parseInt(args[0]); if (nbToDelete < 1 || nbToDelete > 99) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "commands.moderation.clear.number.error.description").build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "commands.moderation.clear.number.error.description").build()).queue(); } else { - List history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete(); + List history = e.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete(); List msgToDelete = new ArrayList<>(history); - event.getTextChannel().deleteMessages(msgToDelete).queue(); + e.getTextChannel().deleteMessages(msgToDelete).queue(); if (nbToDelete == 1) { - Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", + Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "commands.moderation.clear.success.description.singular").build()).complete(); try { TimeUnit.SECONDS.sleep(2); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ex) { + ex.printStackTrace(); } msg.delete().queue(); } else { - Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "", + Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "", "commands.moderation.clear.success.description.plural", String.valueOf(nbToDelete)).build()).complete(); try { TimeUnit.SECONDS.sleep(2); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (InterruptedException ex) { + ex.printStackTrace(); } msg.delete().queue(); } } - } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event); - } catch (IllegalArgumentException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description") + } catch (NumberFormatException ex) { + e.getHelpCommand().sendHelp(this, e); + } catch (IllegalArgumentException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description") .build()).queue(); } } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index e276391..ff9e6f6 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -15,67 +15,67 @@ import net.dv8tion.jda.api.entities.TextChannel; public class EditRulesCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getRethink().getRulesMID(event.getGuild().getId()).length() == 18) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getRethink().getRulesMID(e.getGuild().getId()).length() == 18) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.message.title", "commands.moderation.editrules.message.description").build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event1 -> { - String rules = event1.getMessage().getContentRaw(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + e.getEventWaiter().newOnMessageEventWaiter(e1 -> { + String rules = e1.getMessage().getContentRaw(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.channel.title", "commands.moderation.editrules.channel.description").build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event2 -> { - if (event2.getMessage().getMentionedChannels().size() == 1) { + e.getEventWaiter().newOnMessageEventWaiter(e2 -> { + if (e2.getMessage().getMentionedChannels().size() == 1) { try { - TextChannel channel = event2.getMessage().getMentionedChannels().get(0); - checkChannel(event, rules, channel); - } catch (Exception e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + TextChannel channel = e2.getMessage().getMentionedChannels().get(0); + checkChannel(e, rules, channel); + } catch (Exception ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.editrules.channel.error.title", "commands.moderation.editrules.channel.error.description") .build()).queue(); } } else { try { - TextChannel channel = event1.getGuild().getTextChannelsByName(event2.getMessage().getContentRaw(), true).get(0); - checkChannel(event, rules, channel); - } catch (Exception e) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + TextChannel channel = e1.getGuild().getTextChannelsByName(e2.getMessage().getContentRaw(), true).get(0); + checkChannel(e, rules, channel); + } catch (Exception ex) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.editrules.channel.error.title", "commands.moderation.editrules.channel.error.description") .build()).queue(); } } - }, event.getJDA(), event.getAuthor()); - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.editrules.error.title", "", - "commands.moderation.editrules.error.description", event.getRethink().getGuildPrefix(event.getGuild().getId())).build()).queue(); + "commands.moderation.editrules.error.description", e.getRethink().getGuildPrefix(e.getGuild().getId())).build()).queue(); } } - public void checkChannel(CommandEvent event, String rules, TextChannel channel) { + public void checkChannel(CommandEvent e, String rules, TextChannel channel) { try { - channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).queue(); - setRules(event, rules, channel); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + channel.retrieveMessageById(e.getRethink().getRulesMID(e.getGuild().getId())).queue(); + setRules(e, rules, channel); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.success.title", "commands.moderation.editrules.success.description").build()).queue(); - } catch (Exception e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + } catch (Exception ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.editrules.channel.message.error.title", "commands.moderation.editrules.channel.message.error.description").build()).queue(); } } - public void setRules(CommandEvent event, String rules, TextChannel channel) { - channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + public void setRules(CommandEvent e, String rules, TextChannel channel) { + channel.retrieveMessageById(e.getRethink().getRulesMID(e.getGuild().getId())).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(rules) .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index a3b03b0..333d3bf 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -14,21 +14,21 @@ import com.bbn.hadder.utils.MessageEditor; public class InviteDetectCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 1) { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!event.getRethink().getInviteDetection(event.getGuild().getId())) { - event.getRethink().setInviteDetection(event.getGuild().getId(), true); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (!e.getRethink().getInviteDetection(e.getGuild().getId())) { + e.getRethink().setInviteDetection(e.getGuild().getId(), true); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.activate.success.title", "commands.moderation.invitedetect.activate.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.invitedetect.activate.error.title", "commands.moderation.invitedetect.activate.error.description") @@ -37,15 +37,15 @@ public class InviteDetectCommand implements Command { break; case "off": - if (event.getRethink().getInviteDetection(event.getGuild().getId())) { - event.getRethink().setInviteDetection(event.getGuild().getId(), false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + if (e.getRethink().getInviteDetection(e.getGuild().getId())) { + e.getRethink().setInviteDetection(e.getGuild().getId(), false); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.deactivate.success.title", "commands.moderation.invitedetect.deactivate.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.invitedetect.deactivate.error.title", "commands.moderation.invitedetect.deactivate.error.description") @@ -53,10 +53,10 @@ public class InviteDetectCommand implements Command { } break; default: - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 2fe1b53..608f25d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -15,53 +15,53 @@ import net.dv8tion.jda.api.entities.Member; public class KickCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMessage().getMentionedMembers().size() == 1) { - Member victim = event.getMessage().getMentionedMembers().get(0); - if (!event.getAuthor().getId().equals(victim.getId())) { - if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) { - if (event.getGuild().getSelfMember().canInteract(victim)) { - event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getMessage().getMentionedMembers().size() == 1) { + Member victim = e.getMessage().getMentionedMembers().get(0); + if (!e.getAuthor().getId().equals(victim.getId())) { + if (!e.getJDA().getSelfUser().getId().equals(victim.getId())) { + if (e.getGuild().getSelfMember().canInteract(victim)) { + e.getGuild().kick(victim, "Kicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.success.description", victim.getUser().getName()).build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } - } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event); - } else if (event.getMessage().getMentionedMembers().size() > 1) { - for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { - Member member = event.getMessage().getMentionedMembers().get(i); - if (!event.getAuthor().getId().equals(member.getId())) { - if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { - if (event.getGuild().getSelfMember().canInteract(member)) { - event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue(); + } else if (e.getMessage().getMentionedMembers().size() == 0) { + e.getHelpCommand().sendHelp(this, e); + } else if (e.getMessage().getMentionedMembers().size() > 1) { + for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { + Member member = e.getMessage().getMentionedMembers().get(i); + if (!e.getAuthor().getId().equals(member.getId())) { + if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { + if (e.getGuild().getSelfMember().canInteract(member)) { + e.getGuild().kick(member).reason("Mass Kicked by " + e.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue(); } } - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(e.getMessage().getMentionedMembers().size())).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index e15d9f9..441c737 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -16,52 +16,52 @@ import net.dv8tion.jda.api.entities.Member; public class NickCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { - if (event.getMessage().getMentionedMembers().size() == 1) { - if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) { - if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) { + public void executed(String[] args, CommandEvent e) { + if (e.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) { + if (e.getMessage().getMentionedMembers().size() == 1) { + if (!e.getMessage().getMentionedMembers().get(0).getId().equals(e.getGuild().getSelfMember().getId())) { + if (e.getGuild().getSelfMember().canInteract(e.getMessage().getMentionedMembers().get(0))) { if (args.length > 1) { - if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (e.getMessage().getContentRaw().startsWith(e.getRethink().getUserPrefix(e.getMember().getId()))) { + e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethink().getUserPrefix(e.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", "commands.moderation.nick.success.description", - event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } else if (e.getMessage().getContentRaw().startsWith(e.getRethink().getGuildPrefix(e.getGuild().getId()))) { + e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethink().getGuildPrefix(e.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", - "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + "commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (e.getMessage().getContentRaw().startsWith(e.getRethink().getUserPrefix(e.getMember().getId()))) { + e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethink().getUserPrefix(e.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", "commands.moderation.nick.myself.success.description", "").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } else if (e.getMessage().getContentRaw().startsWith(e.getRethink().getGuildPrefix(e.getGuild().getId()))) { + e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethink().getGuildPrefix(e.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", @@ -69,27 +69,27 @@ public class NickCommand implements Command { ).build()).queue(); } } - } else if (event.getMessage().getMentionedMembers().size() == 0) { - event.getHelpCommand().sendHelp(this, event); + } else if (e.getMessage().getMentionedMembers().size() == 0) { + e.getHelpCommand().sendHelp(this, e); } else { - for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { - Member member = event.getMessage().getMentionedMembers().get(i); - if (!event.getJDA().getSelfUser().getId().equals(member.getId())) { - event.getGuild().modifyNickname(member, args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); + for (int i = 0; i < e.getMessage().getMentionedMembers().size(); i++) { + Member member = e.getMessage().getMentionedMembers().get(i); + if (!e.getJDA().getSelfUser().getId().equals(member.getId())) { + e.getGuild().modifyNickname(member, args[args.length - 1]).reason("Mass Nicked by " + e.getAuthor().getAsTag()).queue(); } else { - event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue(); + e.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + e.getAuthor().getAsTag()).queue(); } } - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", - "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size()) + "commands.moderation.nick.myself.success.description", String.valueOf(e.getMessage().getMentionedMembers().size()) ).build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index 153e64f..a1a6a7b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -10,11 +10,11 @@ import com.bbn.hadder.utils.MessageEditor; public class PrefixCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 1) { if (!args[0].contains("\"")) { - event.getRethink().setGuildPrefix(args[0], event.getGuild().getId()); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getRethink().setGuildPrefix(args[0], e.getGuild().getId()); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.prefix.success.title", "✅", @@ -22,14 +22,14 @@ public class PrefixCommand implements Command { args[0]).build() ).queue(); } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.WARNING, "", "commands.moderation.prefix.error.description").build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index 95f7fff..a5b594d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -16,67 +16,67 @@ import net.dv8tion.jda.api.Region; public class RegionChangeCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 1) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) { switch (args[0].toLowerCase()) { case "amsterdam": - setRegion(Region.AMSTERDAM, "Amsterdam", event); + setRegion(Region.AMSTERDAM, "Amsterdam", e); break; case "frankfurt": - setRegion(Region.FRANKFURT, "Frankfurt", event); + setRegion(Region.FRANKFURT, "Frankfurt", e); break; case "eu-west": - setRegion(Region.EU_WEST, "EU West", event); + setRegion(Region.EU_WEST, "EU West", e); break; case "eu-central": - setRegion(Region.EU_CENTRAL, "EU Central", event); + setRegion(Region.EU_CENTRAL, "EU Central", e); break; case "europe": - setRegion(Region.EUROPE, "EUROPE", event); + setRegion(Region.EUROPE, "EUROPE", e); break; case "brazil": - setRegion(Region.BRAZIL, "Brazil", event); + setRegion(Region.BRAZIL, "Brazil", e); break; case "hongkong": - setRegion(Region.HONG_KONG, "Hong Kong", event); + setRegion(Region.HONG_KONG, "Hong Kong", e); break; case "india": - setRegion(Region.INDIA, "India", event); + setRegion(Region.INDIA, "India", e); break; case "japan": - setRegion(Region.JAPAN, "Japan", event); + setRegion(Region.JAPAN, "Japan", e); break; case "london": - setRegion(Region.LONDON, "London", event); + setRegion(Region.LONDON, "London", e); break; case "russia": - setRegion(Region.RUSSIA, "Russia", event); + setRegion(Region.RUSSIA, "Russia", e); break; case "singapore": - setRegion(Region.SINGAPORE, "Singapore", event); + setRegion(Region.SINGAPORE, "Singapore", e); break; case "south-africa": - setRegion(Region.SOUTH_AFRICA, "South Africa", event); + setRegion(Region.SOUTH_AFRICA, "South Africa", e); break; case "sydney": - setRegion(Region.SYDNEY, "Sydney", event); + setRegion(Region.SYDNEY, "Sydney", e); break; case "us-central": - setRegion(Region.US_CENTRAL, "US Central", event); + setRegion(Region.US_CENTRAL, "US Central", e); break; case "us-east": - setRegion(Region.US_EAST, "US East", event); + setRegion(Region.US_EAST, "US East", e); break; case "us-west": - setRegion(Region.US_WEST, "US West", event); + setRegion(Region.US_WEST, "US West", e); break; case "us-south": - setRegion(Region.US_SOUTH, "US South", event); + setRegion(Region.US_SOUTH, "US South", e); break; default: - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.regionchange.regions.title", "") @@ -84,10 +84,12 @@ public class RegionChangeCommand implements Command { .build()).queue(); break; } + + //TODO: Maybe South Korea. Check the geo restricted discussion } else - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); - } else event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + } else e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.regionchange.regions.title", "") @@ -95,10 +97,10 @@ public class RegionChangeCommand implements Command { .build()).queue(); } - public void setRegion (Region region, String region_name, CommandEvent event) { - event.getGuild().getManager().setRegion(region).reason("Region changed by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void setRegion (Region region, String region_name, CommandEvent e) { + e.getGuild().getManager().setRegion(region).reason("Region changed by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.regionchange.success.title", "", "commands.moderation.regionchange.success.description", region_name) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 47842e8..126ddee 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -13,74 +13,74 @@ import net.dv8tion.jda.api.entities.Role; public class RoleCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { switch (args[0].toLowerCase()) { case "add": - if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) { - for (Member member : event.getMessage().getMentionedMembers()) { - for (Role role : event.getMessage().getMentionedRoles()) { - if (event.getGuild().getSelfMember().canInteract(member)) { - if (event.getGuild().getSelfMember().canInteract(role)) { - event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue(); + if (e.getMessage().getMentionedMembers().size() > 0 && e.getMessage().getMentionedRoles().size() > 0) { + for (Member member : e.getMessage().getMentionedMembers()) { + for (Role role : e.getMessage().getMentionedRoles()) { + if (e.getGuild().getSelfMember().canInteract(member)) { + if (e.getGuild().getSelfMember().canInteract(role)) { + e.getGuild().addRoleToMember(member, role).reason("Role added by " + e.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } } - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.add.success.title", "", "", "commands.moderation.role.add.success.description", - String.valueOf(event.getMessage().getMentionedRoles().size()), - String.valueOf(event.getMessage().getMentionedMembers().size())) + String.valueOf(e.getMessage().getMentionedRoles().size()), + String.valueOf(e.getMessage().getMentionedMembers().size())) .build()).queue(); } break; case "remove": - if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) { - for (Member member : event.getMessage().getMentionedMembers()) { - for (Role role : event.getMessage().getMentionedRoles()) { - if (event.getGuild().getSelfMember().canInteract(member)) { - if (event.getGuild().getSelfMember().canInteract(role)) { - event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue(); + if (e.getMessage().getMentionedMembers().size() > 0 && e.getMessage().getMentionedRoles().size() > 0) { + for (Member member : e.getMessage().getMentionedMembers()) { + for (Role role : e.getMessage().getMentionedRoles()) { + if (e.getGuild().getSelfMember().canInteract(member)) { + if (e.getGuild().getSelfMember().canInteract(role)) { + e.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + e.getAuthor().getAsTag()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } } - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.role.remove.success.title", "", "", "commands.moderation.role.remove.success.description", - String.valueOf(event.getMessage().getMentionedRoles().size()), - String.valueOf(event.getMessage().getMentionedMembers().size())) + String.valueOf(e.getMessage().getMentionedRoles().size()), + String.valueOf(e.getMessage().getMentionedMembers().size())) .build()).queue(); } break; default: - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); break; } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 48951c5..0c49bdd 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -21,92 +21,92 @@ import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; public class RulesCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.setup.title", "commands.moderation.rules.setup.description") .build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event1 -> { - if (event1.getMessage().getMentionedChannels().size() == 1) { + e.getEventWaiter().newOnMessageEventWaiter(e1 -> { + if (e1.getMessage().getMentionedChannels().size() == 1) { try { - TextChannel channel = event1.getMessage().getMentionedChannels().get(0); - createRules(event, event1, channel); - } catch (Exception e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + TextChannel channel = e1.getMessage().getMentionedChannels().get(0); + createRules(e, e1, channel); + } catch (Exception ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.rules.channel.error.title", "commands.moderation.rules.channel.error.description") .build()).queue(); } } else { try { - TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0); - createRules(event, event1, channel); - } catch (Exception e) { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + TextChannel channel = e1.getGuild().getTextChannelsByName(e1.getMessage().getContentRaw(), true).get(0); + createRules(e, e1, channel); + } catch (Exception ex) { + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.channel.error.title", "commands.moderation.rules.channel.error.description") .build()).queue(); } } - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.rules.error.permission.title", "commands.moderation.rules.error.permission.description") .build()).queue(); } } - public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) { - if (channel.getGuild().getId().equals(event1.getGuild().getId())) { - if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) { - event1.getChannel().sendMessage( - event.getMessageEditor().getMessage( + public void createRules(CommandEvent e, GuildMessageReceivedEvent e1, TextChannel channel) { + if (channel.getGuild().getId().equals(e1.getGuild().getId())) { + if (e.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) { + e1.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.rules.title", "", "commands.moderation.rules.rules.description", channel.getName()) .build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event2 -> { - String message = event2.getMessage().getContentRaw(); - event2.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getEventWaiter().newOnMessageEventWaiter(e2 -> { + String message = e2.getMessage().getContentRaw(); + e2.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.role.title", "commands.moderation.rules.role.description") .build()).queue(); - new EventWaiter().newOnMessageEventWaiter(event3 -> { - if (event3.getMessage().getMentionedRoles().size() == 1) { - Role role = event3.getMessage().getMentionedRoles().get(0); - setRole(event, channel, message, event3, role); - } else if (event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).size() > 0) { - Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentRaw(), true).get(0); - setRole(event, channel, message, event3, role); + new EventWaiter().newOnMessageEventWaiter(e3 -> { + if (e3.getMessage().getMentionedRoles().size() == 1) { + Role role = e3.getMessage().getMentionedRoles().get(0); + setRole(e, channel, message, e3, role); + } else if (e3.getGuild().getRolesByName(e3.getMessage().getContentRaw(), true).size() > 0) { + Role role = e3.getGuild().getRolesByName(e3.getMessage().getContentRaw(), true).get(0); + setRole(e, channel, message, e3, role); } else { - event3.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e3.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.role.error.title", "commands.moderation.rules.role.error.description") .build()).queue(); } - }, event.getJDA(), event.getAuthor()); - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.rules.error.message.title", "commands.moderation.rules.error.message.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.guild.error.title", "commands.moderation.rules.guild.error.description") @@ -114,117 +114,117 @@ public class RulesCommand implements Command { } } - public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) { - if (event3.getGuild().getSelfMember().canInteract(role)) { - if (event3.getMember().canInteract(role)) { - event3.getChannel().sendMessage( - event.getMessageEditor().getMessage( + public void setRole(CommandEvent e, TextChannel channel, String message, GuildMessageReceivedEvent e3, Role role) { + if (e3.getGuild().getSelfMember().canInteract(role)) { + if (e3.getMember().canInteract(role)) { + e3.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.emote.accept.title", "", "commands.moderation.rules.emote.accept.description", role.getName()) .build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event4 -> { - if (event4.getMessage().getEmotes().size() == 1) { - Emote aemote = event4.getMessage().getEmotes().get(0); - event4.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getEventWaiter().newOnMessageEventWaiter(e4 -> { + if (e4.getMessage().getEmotes().size() == 1) { + Emote aemote = e4.getMessage().getEmotes().get(0); + e4.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.emote.decline.title", "", "commands.moderation.rules.emote.decline.description", String.valueOf(aemote)) .build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event5 -> { - Emote demote = event5.getMessage().getEmotes().get(0); + e.getEventWaiter().newOnMessageEventWaiter(e5 -> { + Emote demote = e5.getMessage().getEmotes().get(0); if (!aemote.equals(demote)) { - Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + Message rules = channel.sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(message) .build()).complete(); try { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); - event5.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e5.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.success.title", "", "commands.moderation.rules.success.description", channel.getAsMention()) .build()).queue(); - } catch (Exception e) { - event5.getChannel().sendMessage( - event.getMessageEditor().getMessage( + } catch (Exception ex) { + e5.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "error", "commands.moderation.rules.emote.error.access.description") .build()).queue(); - e.printStackTrace(); + ex.printStackTrace(); } - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); + e.getRethink().updateRules(e.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.emote.error.equal.title", "commands.moderation.rules.emote.error.equal.description") .build()).queue(); } - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else { - String aemote = event4.getMessage().getContentRaw(); - event4.getChannel().sendMessage( - event.getMessageEditor().getMessage( + String aemote = e4.getMessage().getContentRaw(); + e4.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.emote.decline.title", "commands.moderation.rules.emoji.decline.description") .build()).queue(); - event.getEventWaiter().newOnMessageEventWaiter(event5 -> { - String demote = event5.getMessage().getContentRaw(); + e.getEventWaiter().newOnMessageEventWaiter(e5 -> { + String demote = e5.getMessage().getContentRaw(); if (!aemote.equals(demote)) { - Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + Message rules = channel.sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(message) .build()).complete(); try { rules.addReaction(aemote).queue(); rules.addReaction(demote).queue(); - event5.getChannel().sendMessage( - event.getMessageEditor().getMessage( + e5.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.rules.success.title", "", "commands.moderation.rules.success.description", channel.getAsMention()) .build()).queue(); - } catch (Exception e) { - event5.getChannel().sendMessage( - event.getMessageEditor().getMessage( + } catch (Exception ex) { + e5.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "error", "commands.moderation.rules.emoji.error.description") .build()).queue(); - e.printStackTrace(); + ex.printStackTrace(); } - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); + e.getRethink().updateRules(e.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.emote.error.equal.title", "commands.moderation.rules.emote.error.equal.description") .build()).queue(); } - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); } - }, event.getJDA(), event.getAuthor()); + }, e.getJDA(), e.getAuthor()); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.rules.role.permission.error.title", "commands.moderation.rules.role.permission.error.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.rules.error.interact.title", "commands.moderation.rules.error.interact.description") .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index d3c97ff..7824859 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -8,28 +8,28 @@ import net.dv8tion.jda.api.entities.TextChannel; public class StarboardCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMessage().getMentionedChannels().size()==1) { - event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId()); - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getMessage().getMentionedChannels().size()==1) { + e.getRethink().setStarboardChannel(e.getGuild().getId(), e.getMessage().getMentionedChannels().get(0).getId()); + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.starboard.success.title","") .build()) .queue(); } else { if (args.length>0) { - TextChannel channel = event.getGuild().getTextChannelById(args[0]); + TextChannel channel = e.getGuild().getTextChannelById(args[0]); if (channel!=null) { - event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId()); + e.getRethink().setStarboardChannel(e.getGuild().getId(), channel.getId()); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } if (args.length==2) { - event.getRethink().setNeededStars(args[1], event.getGuild().getId()); + e.getRethink().setNeededStars(args[1], e.getGuild().getId()); } } diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index c227118..b6c16ff 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -14,29 +14,29 @@ public class BassCommand implements Command { -0.1f, -0.1f, -0.1f, -0.1f }; @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { float value = Float.parseFloat(args[0]); EqualizerFactory equalizer = new EqualizerFactory(); for (int i = 0; i < BASS_BOOST.length; i++) { equalizer.setGain(i, BASS_BOOST[i] + value); } - event.getAudioManager().getPlayer(event.getGuild()).setFrameBufferDuration(500); - event.getAudioManager().getPlayer(event.getGuild()).setFilterFactory(equalizer); + e.getAudioManager().getPlayer(e.getGuild()).setFrameBufferDuration(500); + e.getAudioManager().getPlayer(e.getGuild()).setFilterFactory(equalizer); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.bass.error.connected.title", "commands.music.bass.error.connected.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event); + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java index e91f03e..5f615f6 100644 --- a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java @@ -12,17 +12,17 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack; public class InfoCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - AudioTrack track = event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + AudioTrack track = e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.info.success.title", "") .setAuthor(track.getInfo().author) .addField("Title", track.getInfo().title, true) - .addField("Progress", "`[ " + event.getAudioManager().getTimestamp(track.getPosition()) + " / " + event.getAudioManager().getTimestamp(track.getInfo().length) + " ]`", false) + .addField("Progress", "`[ " + e.getAudioManager().getTimestamp(track.getPosition()) + " / " + e.getAudioManager().getTimestamp(track.getInfo().length) + " ]`", false) .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index acce3c6..e59cd89 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -14,32 +14,32 @@ import net.dv8tion.jda.api.managers.AudioManager; public class JoinCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMember().getVoiceState().inVoiceChannel()) { - AudioManager audioManager = event.getGuild().getAudioManager(); + public void executed(String[] args, CommandEvent e) { + if (e.getMember().getVoiceState().inVoiceChannel()) { + AudioManager audioManager = e.getGuild().getAudioManager(); if(!audioManager.isAttemptingToConnect()) { - VoiceChannel vc = event.getMember().getVoiceState().getChannel(); - if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { - if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { + VoiceChannel vc = e.getMember().getVoiceState().getChannel(); + if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { + if (!e.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { try { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getGuild().getAudioManager().openAudioConnection(vc); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.music.join.success.title", "", "commands.music.join.success.description", vc.getName()) .build()).queue(); - } catch (InsufficientPermissionException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + } catch (InsufficientPermissionException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.join.error.permission.title", "commands.music.join.error.permission.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.WARNING, "commands.music.join.error.connecting.already.title", "commands.music.join.error.connecting.already.description") @@ -47,28 +47,28 @@ public class JoinCommand implements Command { } } else { try { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getGuild().getAudioManager().openAudioConnection(vc); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.music.join.success.title", "", "commands.music.join.success.description", vc.getName()) .build()).queue(); - } catch (InsufficientPermissionException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + } catch (InsufficientPermissionException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.join.error.permission.title", "commands.music.join.error.permission.description") .build()).queue(); } } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.WARNING, "commands.music.join.error.connecting.trying.title", "commands.music.join.error.connecting.trying.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.music.join.error.channel.title", "commands.music.join.error.channel.description") diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index 8636984..3b1b663 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -11,23 +11,23 @@ import com.bbn.hadder.utils.MessageEditor; public class LeaveCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + e.getGuild().getAudioManager().closeAudioConnection(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.music.leave.success.title", "commands.music.leave.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.leave.error.channel.title", "commands.music.leave.error.channel.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.music.leave.error.connected.tile", "commands.music.leave.error.connected.description") diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 5003134..5d37e70 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -11,24 +11,24 @@ import com.bbn.hadder.utils.MessageEditor; public class LoopCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - if (event.getAudioManager().getTrackManager(event.getGuild()).isLoop()) { - event.getAudioManager().getTrackManager(event.getGuild()).setLoop(false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); + public void executed(String[] args, CommandEvent e) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + if (e.getAudioManager().getTrackManager(e.getGuild()).isLoop()) { + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); } else { - event.getAudioManager().getTrackManager(event.getGuild()).setLoop(true); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); + e.getAudioManager().getTrackManager(e.getGuild()).setLoop(true); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.loop.error.connected.title", "commands.music.loop.error.connected.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java index f67a099..8447d2a 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java @@ -11,29 +11,29 @@ import com.bbn.hadder.utils.MessageEditor; public class PauseCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - if (!event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { - event.getAudioManager().getPlayer(event.getGuild()).setPaused(true); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + if (!e.getAudioManager().getPlayer(e.getGuild()).isPaused()) { + e.getAudioManager().getPlayer(e.getGuild()).setPaused(true); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.pause.success.title", "commands.music.pause.success.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.pause.error.paused.title", "commands.music.pause.error.paused.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.pause.error.connected.title", "commands.music.pause.error.connected.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 1646769..7561253 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -15,48 +15,48 @@ import java.net.URL; public class PlayCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getMember().getVoiceState().inVoiceChannel()) { - String input = event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "play ", "").replaceFirst(event.getRethink().getUserPrefix(event.getAuthor().getId()) + "play ", ""); + if (e.getMember().getVoiceState().inVoiceChannel()) { + String input = e.getMessage().getContentRaw().replaceFirst(e.getRethink().getGuildPrefix(e.getGuild().getId()) + "play ", "").replaceFirst(e.getRethink().getUserPrefix(e.getAuthor().getId()) + "play ", ""); try { new URL(input).toURI(); - Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); - event.getAudioManager().loadTrack(input, event, msg); - } catch (InsufficientPermissionException e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getAudioManager().loadTrack(input, e, msg); + } catch (InsufficientPermissionException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.join.error.permission.title", "commands.music.join.error.permission.description") .build()).queue(); } catch (Exception ignore) { - Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); - event.getAudioManager().loadTrack("ytsearch: " + input, event, msg); + e.getAudioManager().loadTrack("ytsearch: " + input, e, msg); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.music.join.error.channel.title", "commands.music.join.error.channel.description") .build()).queue(); } - } else if (event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - event.getAudioManager().getPlayer(event.getGuild()).setPaused(false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + } else if (e.getAudioManager().getPlayer(e.getGuild()).isPaused()) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + e.getAudioManager().getPlayer(e.getGuild()).setPaused(false); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.success.unpause.title", "commands.music.play.success.unpause.description") .build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.play.error.connected.title", "commands.music.play.error.connected.description") .build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event); + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index 0336a2b..1375d34 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -14,22 +14,22 @@ import java.util.Set; public class QueueCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + public void executed(String[] args, CommandEvent e) { + if (!e.getAudioManager().hasPlayer(e.getGuild()) || e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks().isEmpty()) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.queue.error.title", "commands.music.queue.error.description" ).build()).queue(); } else { - Set queue = event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks(); + Set queue = e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks(); StringBuilder builder = new StringBuilder(); long queuelength = 0; for (AudioInfo g : queue) { queuelength = queuelength + g.getTrack().getInfo().length; - builder.append("("+event.getAudioManager().getTimestamp(g.getTrack().getInfo().length)+") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n"); + builder.append("("+e.getAudioManager().getTimestamp(g.getTrack().getInfo().length)+") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n"); } - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.queue.success.title", "("+String.valueOf(event.getAudioManager().getTimestamp(queuelength))+")", + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.queue.success.title", "("+String.valueOf(e.getAudioManager().getTimestamp(queuelength))+")", "commands.music.queue.success.description", builder.toString()) .build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index 40f366f..6381254 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -11,20 +11,20 @@ import com.bbn.hadder.utils.MessageEditor; public class SkipCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - event.getAudioManager().forceSkipTrack(event); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && !e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks().isEmpty()) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + e.getAudioManager().forceSkipTrack(e); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.skip.success.title", "commands.music.skip.success.description").build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.skip.error.connected.title", "commands.music.skip.error.connected.description ").build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index 56cd891..ded6997 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -11,24 +11,24 @@ import com.bbn.hadder.utils.MessageEditor; public class StopCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - event.getAudioManager().players.remove(event.getGuild().getId()); - event.getAudioManager().getPlayer(event.getGuild()).destroy(); - event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { + e.getAudioManager().players.remove(e.getGuild().getId()); + e.getAudioManager().getPlayer(e.getGuild()).destroy(); + e.getAudioManager().getTrackManager(e.getGuild()).purgeQueue(); + e.getGuild().getAudioManager().closeAudioConnection(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.stop.success.title", "commands.music.stop.success.description").build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.stop.error.connected.title", "commands.music.stop.error.connected.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index b39fbf2..66ad14b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -11,39 +11,37 @@ import com.bbn.hadder.utils.MessageEditor; public class VolumeCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) { + if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) { try { int volume = Integer.parseInt(args[0]); - if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { - event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + if (volume < 201 && volume > 0 || e.getConfig().getOwners().contains(e.getAuthor().getIdLong())) { + e.getAudioManager().getPlayer(e.getGuild()).setVolume(volume); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.volume.success.title", "", "commands.music.volume.success.description", String.valueOf(volume)).build()).queue(); } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.volume.error.int.title", "commands.music.volume.error.int.description").build()).queue(); } - } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event); - } catch (Exception e) { - e.printStackTrace(); + } catch (NumberFormatException ex) { + e.getHelpCommand().sendHelp(this, e); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.volume.error.connected.title", "commands.music.volume.error.connected.description") .build()).queue(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", "commands.music.info.error.description").build()).queue(); } - } else event.getHelpCommand().sendHelp(this, event); + } else e.getHelpCommand().sendHelp(this, e); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index e66169e..04e0806 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class AnalCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build(); @@ -30,18 +30,18 @@ public class AnalCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Anal") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 3136a3e..cf55c8d 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class BDSMCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build(); @@ -30,18 +30,18 @@ public class BDSMCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("BDSM") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 7f4302a..e1da608 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -16,8 +16,8 @@ import java.io.IOException; public class BlowjobCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://nekos.life/api/v2/img/blowjob").build(); @@ -27,18 +27,18 @@ public class BlowjobCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Blowjob") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 9ff9393..dfe0a6f 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class BoobsCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/").build(); @@ -31,18 +31,18 @@ public class BoobsCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Boobs") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 4eacd90..b98c9b2 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class CumCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/").build(); @@ -31,18 +31,18 @@ public class CumCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Cum") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index f3d8434..791f3b6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -16,8 +16,8 @@ import java.io.IOException; public class EroticCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://nekos.life/api/v2/img/erok").build(); @@ -27,18 +27,18 @@ public class EroticCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Erotic") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index b3a56d4..0637115 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class FeetCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/").build(); @@ -31,18 +31,18 @@ public class FeetCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Feet") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 983d6db..45fdd0a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class FingeringCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/").build(); @@ -31,18 +31,18 @@ public class FingeringCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Fingering") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 2219b45..b52d4da 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class LickingCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/").build(); @@ -31,18 +31,18 @@ public class LickingCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Licking") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 32cabcb..3efb550 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class PornCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/").build(); @@ -31,18 +31,18 @@ public class PornCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Porn") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 9e6410c..78373d5 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -16,8 +16,8 @@ import java.io.IOException; public class PussyCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://nekos.life/api/v2/img/pussy").build(); @@ -27,18 +27,18 @@ public class PussyCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Pussy") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index ddc3d7e..ee1ba9f 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class RandomPornCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/") @@ -32,20 +32,20 @@ public class RandomPornCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel() - .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), + e.getTextChannel() + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")).setFooter("Random Porn").build()) .queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel() - .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) + e.getTextChannel() + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) .queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 1514b8e..4a04516 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class SoloCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/").build(); @@ -31,18 +31,18 @@ public class SoloCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")) .setFooter("Solo") .build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index 12615ec..7ca2911 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -17,8 +17,8 @@ import java.io.IOException; public class SpankCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/").build(); @@ -31,18 +31,18 @@ public class SpankCommand implements Command { JSONObject response1 = data.getJSONObject("response"); String url = response1.toString().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel() - .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) + e.getTextChannel() + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) .queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index f2c0c97..93bffbf 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -16,8 +16,8 @@ import java.io.IOException; public class TransCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getTextChannel().isNSFW()) { + public void executed(String[] args, CommandEvent e) { + if (e.getTextChannel().isNSFW()) { OkHttpClient caller = new OkHttpClient(); Request request = new Request.Builder().url("https://nekos.life/api/v2/img/trap").build(); @@ -27,18 +27,18 @@ public class TransCommand implements Command { Response response = caller.newCall(request).execute(); String url = response.body().string().replace("{\"url\":\"", ""); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) .setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue(); - } catch (IOException e) { - e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } } else { - event.getTextChannel() - .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) + e.getTextChannel() + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) .queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 5aa61f1..89b7a12 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -21,15 +21,15 @@ import java.util.List; public class BlacklistCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 0) { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } else { switch (args[0].toLowerCase()) { case "add": if (args.length == 3) { - Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethink().getBlackListed(member.getId()); + Member member = e.getMessage().getMentionedMembers().get(0); + String blacklisted = e.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); @@ -37,9 +37,9 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethink().setBlackListed(member.getId(), newblacklisted); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + e.getRethink().setBlackListed(member.getId(), newblacklisted); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); @@ -48,8 +48,8 @@ public class BlacklistCommand implements Command { case "remove": if (args.length == 3) { - Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethink().getBlackListed(member.getId()); + Member member = e.getMessage().getMentionedMembers().get(0); + String blacklisted = e.getRethink().getBlackListed(member.getId()); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); @@ -57,9 +57,9 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethink().setBlackListed(member.getId(), newblacklisted); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + e.getRethink().setBlackListed(member.getId(), newblacklisted); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); @@ -68,23 +68,23 @@ public class BlacklistCommand implements Command { case "list": StringBuilder stringBuilder = new StringBuilder(); - for (User user : event.getJDA().getUsers()) { - if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { - String blacklisted = event.getRethink().getBlackListed(user.getId()); + for (User user : e.getJDA().getUsers()) { + if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { + String blacklisted = e.getRethink().getBlackListed(user.getId()); if (!"none".equals(blacklisted)) { stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); } } } - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Blacklisted Users:") .setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users") .build()).queue(); break; default: - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); break; } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index c9758b4..9e079ee 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; public class EvalCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn"); @@ -32,18 +32,18 @@ public class EvalCommand implements Command { ex.printStackTrace(); } - engine.put("msg".toLowerCase(), event.getMessage()); + engine.put("msg".toLowerCase(), e.getMessage()); engine.put("shardmanager".toLowerCase(), Hadder.shardManager); - engine.put("rethink".toLowerCase(), event.getRethink()); - engine.put("event".toLowerCase(), event); - engine.put("jda".toLowerCase(), event.getJDA()); - engine.put("message".toLowerCase(), event.getMessage()); - engine.put("guild".toLowerCase(), event.getGuild()); - engine.put("channel".toLowerCase(), event.getChannel()); - engine.put("author".toLowerCase(), event.getAuthor()); - engine.put("member".toLowerCase(), event.getMember()); - engine.put("self".toLowerCase(), event.getGuild().getSelfMember()); - engine.put("audio".toLowerCase(), event.getAudioManager()); + engine.put("rethink".toLowerCase(), e.getRethink()); + engine.put("e".toLowerCase(), e); + engine.put("jda".toLowerCase(), e.getJDA()); + engine.put("message".toLowerCase(), e.getMessage()); + engine.put("guild".toLowerCase(), e.getGuild()); + engine.put("channel".toLowerCase(), e.getChannel()); + engine.put("author".toLowerCase(), e.getAuthor()); + engine.put("member".toLowerCase(), e.getMember()); + engine.put("self".toLowerCase(), e.getGuild().getSelfMember()); + engine.put("audio".toLowerCase(), e.getAudioManager()); engine.put("out".toLowerCase(), System.out); ScheduledExecutorService service = Executors.newScheduledThreadPool(1); @@ -61,21 +61,21 @@ public class EvalCommand implements Command { } out = engine.eval(script.toString()); - event.getTextChannel().sendMessage(event.getMessageEditor() + e.getTextChannel().sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "") - .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.input"), + .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.input"), "```java\n\n" + script + "```", false) - .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.output"), + .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.output"), "```java\n\n" + out.toString() + "```", false) - .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"), + .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.timing"), System.currentTimeMillis() - startExec + " milliseconds", false) .build()).queue(); } catch (Exception ex) { - event.getTextChannel().sendMessage(event.getMessageEditor() + e.getTextChannel().sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.owner.eval.success.title", "") - .addField(event.getMessageEditor().getTerm("error"), + .addField(e.getMessageEditor().getTerm("error"), "```java\n\n" + ex.getMessage() + "```", false) - .addField(event.getMessageEditor().getTerm("commands.owner.eval.success.timing"), + .addField(e.getMessageEditor().getTerm("commands.owner.eval.success.timing"), System.currentTimeMillis() - startExec + " milliseconds", false) .build()).queue(); @@ -86,7 +86,7 @@ public class EvalCommand implements Command { }, 0, TimeUnit.MILLISECONDS); } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 458fc12..95b0d9d 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -15,22 +15,22 @@ import net.dv8tion.jda.api.entities.Guild; public class GuildLeaveCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - Guild guild = event.getJDA().getGuildById(args[0]); + Guild guild = e.getJDA().getGuildById(args[0]); try { guild.leave().queue(); - event.getTextChannel() - .sendMessage(event.getMessageEditor() + e.getTextChannel() + .sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title", "", "commands.owner.guildleave.success.description", guild.getName()) .build()) .queue(); - } catch (Exception e) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue(); + } catch (Exception ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue(); } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index 72f1feb..ec1e335 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -13,7 +13,7 @@ import com.bbn.hadder.core.Perms; public class RebootCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { Runtime.getRuntime().exit(69); } diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 3245a42..42c895e 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -14,9 +14,9 @@ import com.bbn.hadder.utils.MessageEditor; public class ShutdownCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); - event.getJDA().getShardManager().shutdown(); + public void executed(String[] args, CommandEvent e) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); + e.getJDA().getShardManager().shutdown(); System.out.println("Bot shut down via Command..."); Runtime.getRuntime().exit(69); } diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index 3473085..edce17c 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -11,8 +11,8 @@ import com.bbn.hadder.utils.MessageEditor.MessageType; public class TestCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue(); + public void executed(String[] args, CommandEvent e) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue(); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 6a8ca22..f34b4ae 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -11,41 +11,41 @@ import com.bbn.hadder.utils.MessageEditor; public class LanguageCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 1) { switch (args[0].toLowerCase()) { case "de": - setLanguage("de", "German", event); + setLanguage("de", "German", e); break; case "en": - setLanguage("en", "English", event); + setLanguage("en", "English", e); break; case "es": - setLanguage("es", "Spanish", event); + setLanguage("es", "Spanish", e); break; case "fr": - setLanguage("fr", "French", event); + setLanguage("fr", "French", e); break; case "ru": - setLanguage("ru", "Russian", event); + setLanguage("ru", "Russian", e); break; case "tr": - setLanguage("tr", "Turkish", event); + setLanguage("tr", "Turkish", e); break; case "zh": - setLanguage("zh", "Chinese", event); + setLanguage("zh", "Chinese", e); break; } } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } - public void setLanguage(String language_code, String language, CommandEvent event) { - event.getRethink().setLanguage(event.getAuthor().getId(), language_code); - event.getTextChannel() + public void setLanguage(String language_code, String language, CommandEvent e) { + e.getRethink().setLanguage(e.getAuthor().getId(), language_code); + e.getTextChannel() .sendMessage( - event.getMessageEditor() + e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title", "", "commands.settings.language.success.description", language) .build()) diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index 19d52e9..0cd0fbd 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -10,17 +10,17 @@ import com.bbn.hadder.utils.MessageEditor; public class UserPrefixCommand implements Command { - public void executed(String[] args, CommandEvent event) { + public void executed(String[] args, CommandEvent e) { if (args.length == 1) { - event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); - event.getTextChannel() - .sendMessage(event.getMessageEditor() + e.getRethink().setUserPrefix(args[0], e.getAuthor().getId()); + e.getTextChannel() + .sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "", "commands.settings.prefix.success.description", args[0]) .build()) .queue(); } else { - event.getHelpCommand().sendHelp(this, event); + e.getHelpCommand().sendHelp(this, e); } } diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index dff1e8b..0bb77ef 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -24,17 +24,17 @@ public class CommandListener extends ListenerAdapter { } @Override - public void onMessageReceived(MessageReceivedEvent event) { - if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) { + public void onMessageReceived(MessageReceivedEvent e) { + if (e.isFromType(ChannelType.TEXT) && !e.getAuthor().isBot()) { String[] prefixes = { - rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), - event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(), - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + rethink.getUserPrefix(e.getAuthor().getId()), rethink.getGuildPrefix(e.getGuild().getId()), + e.getGuild().getSelfMember().getAsMention() + " ", e.getGuild().getSelfMember().getAsMention(), + e.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", + e.getGuild().getSelfMember().getAsMention().replace("@", "@!") }; for (String prefix : prefixes) { - if (event.getMessage().getContentRaw().startsWith(prefix)) { - handler.handle(event, rethink, prefix, audioManager); + if (e.getMessage().getContentRaw().startsWith(prefix)) { + handler.handle(e, rethink, prefix, audioManager); return; } } diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 25dfb0b..fceee18 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -26,48 +26,48 @@ public class GuildListener extends ListenerAdapter { this.config = config; } - public void onGuildJoin(GuildJoinEvent event) { + public void onGuildJoin(GuildJoinEvent e) { new Thread(() -> { - for (Member member : event.getGuild().getMembers()) { - if (!member.getUser().getId().equals(event.getJDA().getSelfUser().getId())) { + for (Member member : e.getGuild().getMembers()) { + if (!member.getUser().getId().equals(e.getJDA().getSelfUser().getId())) { rethink.insertUser(member.getUser().getId()); } } }).start(); - rethink.insertGuild(event.getGuild().getId()); - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) + rethink.insertGuild(e.getGuild().getId()); + e.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) .setTitle("Joined Server") - .setThumbnail(event.getGuild().getIconUrl()) - .addField("Name", event.getGuild().getName(), true) - .addField("Guild ID", event.getGuild().getId(), true) - .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true) - .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true) - .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) + .setThumbnail(e.getGuild().getIconUrl()) + .addField("Name", e.getGuild().getName(), true) + .addField("Guild ID", e.getGuild().getId(), true) + .addField("Guild Owner", e.getGuild().getOwner().getUser().getAsTag(), true) + .addField("Users", String.valueOf(e.getGuild().getMembers().size()), true) + .setFooter(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); new BotList(config).post(); } - public void onGuildLeave(GuildLeaveEvent event) { - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) + public void onGuildLeave(GuildLeaveEvent e) { + e.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO) .setTitle("Left Server") - .setThumbnail(event.getGuild().getIconUrl()) - .addField("Name", event.getGuild().getName(), true) - .addField("Guild ID", event.getGuild().getId(), true) - .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true) - .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true) - .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl()) + .setThumbnail(e.getGuild().getIconUrl()) + .addField("Name", e.getGuild().getName(), true) + .addField("Guild ID", e.getGuild().getId(), true) + .addField("Guild Owner", e.getGuild().getOwner().getUser().getAsTag(), true) + .addField("Users", String.valueOf(e.getGuild().getMembers().size()), true) + .setFooter(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl()) .setTimestamp(Instant.now()) .build()).queue(); new BotList(config).post(); } - public void onGuildMemberJoin(GuildMemberJoinEvent event) { - if (!event.getUser().getId().equals(event.getJDA().getSelfUser().getId())) { - rethink.insertUser(event.getUser().getId()); + public void onGuildMemberJoin(GuildMemberJoinEvent e) { + if (!e.getUser().getId().equals(e.getJDA().getSelfUser().getId())) { + rethink.insertUser(e.getUser().getId()); } } } diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index a12fad6..380051c 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -27,12 +27,12 @@ public class InviteLinkListener extends ListenerAdapter { } @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) { - checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) { - checkInvite(event.getMessage(), "discordapp.com/invite/"); + public void onMessageReceived(@Nonnull MessageReceivedEvent e) { + if (e.isFromType(ChannelType.TEXT)) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(e.getGuild().getId()))) { + checkInvite(e.getMessage(), "discord.gg/"); + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(e.getGuild().getId()))) { + checkInvite(e.getMessage(), "discordapp.com/invite/"); } } } @@ -54,12 +54,12 @@ public class InviteLinkListener extends ListenerAdapter { } @Override - public void onMessageUpdate(@Nonnull MessageUpdateEvent event) { - if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { - checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { - checkInvite(event.getMessage(), "discordapp.com/invite/"); + public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { + if (e.isFromType(ChannelType.TEXT)) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(e.getGuild().getId())) { + checkInvite(e.getMessage(), "discord.gg/"); + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(e.getGuild().getId())) { + checkInvite(e.getMessage(), "discordapp.com/invite/"); } } } diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index cd14129..8d0ad7d 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -18,21 +18,21 @@ public class MentionListener extends ListenerAdapter { } @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())|| - event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { - event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO) + public void onMessageReceived(@Nonnull MessageReceivedEvent e) { + if (e.isFromType(ChannelType.TEXT) && (e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention())|| + e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { + e.getChannel().sendMessage(new MessageEditor(rethink, e.getAuthor()).getMessage(MessageEditor.MessageType.INFO) .setTitle("Hello I'm Hadder.") - .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) - .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) - .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) - .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) - .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false) + .setAuthor(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl(), e.getJDA().getSelfUser().getAvatarUrl()) + .addField("Users", String.valueOf(e.getJDA().getUsers().size()), false) + .addField("Guilds", String.valueOf(e.getJDA().getGuilds().size()), false) + .addField("Prefix (User)", rethink.getUserPrefix(e.getAuthor().getId()), false) + .addField("Prefix (Guild)", rethink.getGuildPrefix(e.getGuild().getId()), false) .build()).queue(); - } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { - int member = new Random().nextInt(event.getGuild().getMembers().size()-1); - if (member>0&&member0&&member { - for (User user : event.getJDA().getUsers()) { - if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { + for (User user : e.getJDA().getUsers()) { + if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { rethink.insertUser(user.getId()); } } - for (Guild g : event.getJDA().getGuilds()) { + for (Guild g : e.getJDA().getGuilds()) { rethink.insertGuild(g.getId()); } }).start(); diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 55f3ef6..69eb321 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -18,40 +18,40 @@ public class RulesListener extends ListenerAdapter { } @Override - public void onMessageReactionAdd(MessageReactionAddEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { - if (event.getReactionEmote().isEmote()) { - if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { - addRole(event); - } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { - event.getReaction().removeReaction(event.getUser()).queue(); - if (event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getMember().kick().reason("Declined the rules"); + public void onMessageReactionAdd(MessageReactionAddEvent e) { + if (e.getMessageId().equals(rethink.getRulesMID(e.getGuild().getId())) && !e.getMember().getUser().isBot()) { + if (e.getReactionEmote().isEmote()) { + if (rethink.getRulesAEmote(e.getGuild().getId()).equals(e.getReactionEmote().getId())) { + addRole(e); + } else if (rethink.getRulesDEmote(e.getGuild().getId()).equals(e.getReactionEmote().getId())) { + e.getReaction().removeReaction(e.getUser()).queue(); + if (e.getGuild().getSelfMember().canInteract(e.getMember())) { + e.getMember().kick().reason("Declined the rules"); } } - } else if (event.getReactionEmote().isEmoji()) { - if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { - addRole(event); - } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { - event.getReaction().removeReaction(event.getUser()).queue(); - if (event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getMember().kick().reason("Declined the rules"); + } else if (e.getReactionEmote().isEmoji()) { + if (rethink.getRulesAEmote(e.getGuild().getId()).equals(e.getReactionEmote().getEmoji())) { + addRole(e); + } else if (rethink.getRulesDEmote(e.getGuild().getId()).equals(e.getReactionEmote().getEmoji())) { + e.getReaction().removeReaction(e.getUser()).queue(); + if (e.getGuild().getSelfMember().canInteract(e.getMember())) { + e.getMember().kick().reason("Declined the rules"); } } } } } - private void addRole(MessageReactionAddEvent event) { - if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId())))) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); - } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + private void addRole(MessageReactionAddEvent e) { + if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethink.getRulesRID(e.getGuild().getId())))) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethink.getRulesRID(e.getGuild().getId()))).reason("Accepted rules").queue(); + } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethink.getRulesRID(e.getGuild().getId()))).reason("Accepted rules").queue(); } @Override - public void onMessageReactionRemove(MessageReactionRemoveEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue(); + public void onMessageReactionRemove(MessageReactionRemoveEvent e) { + if (e.getMessageId().equals(rethink.getRulesMID(e.getGuild().getId())) && !e.getMember().getUser().isBot()) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethink.getRulesRID(e.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 38c5c52..2c4fb24 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -20,21 +20,21 @@ public class StarboardListener extends ListenerAdapter { } @Override - public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent event) { - update(event); + public void onMessageReactionAdd(@Nonnull MessageReactionAddEvent e) { + update(e); } @Override - public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent event) { - update(event); + public void onMessageReactionRemove(@Nonnull MessageReactionRemoveEvent e) { + update(e); } - public void update(GenericMessageReactionEvent event) { - if (event.getReaction().getReactionEmote().getName().equals("⭐")) { - if (!rethink.hasStarboardMessage(event.getMessageId())) { - if (rethink.hasStarboardChannel(event.getGuild().getId())) { + public void update(GenericMessageReactionEvent e) { + if (e.getReaction().getReactionEmote().getName().equals("⭐")) { + if (!rethink.hasStarboardMessage(e.getMessageId())) { + if (rethink.hasStarboardChannel(e.getGuild().getId())) { - event.getTextChannel().retrieveMessageById(event.getMessageId()).queue( + e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { Integer stars = 0; for (MessageReaction reaction : msg.getReactions()) { @@ -43,17 +43,17 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) { - event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) + if (Integer.parseInt(rethink.getNeededStars(e.getGuild().getId())) <= stars) { + e.getGuild().getTextChannelById(rethink.getStarboardChannel(e.getGuild().getId())) .sendMessage(new MessageBuilder() - .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention()) + .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention()) .setEmbed( new EmbedBuilder() .setAuthor(msg.getAuthor().getAsTag()) .setDescription(msg.getContentRaw()) .setTimestamp(msg.getTimeCreated()).build()).build()).queue( starboardmsg -> { - rethink.insertStarboardMessage(msg.getId(), event.getGuild().getId(), starboardmsg.getId()); + rethink.insertStarboardMessage(msg.getId(), e.getGuild().getId(), starboardmsg.getId()); } ); } @@ -63,7 +63,7 @@ public class StarboardListener extends ListenerAdapter { } } else { - event.getTextChannel().retrieveMessageById(event.getMessageId()).queue( + e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { Integer stars = 0; for (MessageReaction reaction : msg.getReactions()) { @@ -73,13 +73,13 @@ public class StarboardListener extends ListenerAdapter { } Integer finalStars = stars; - event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) - .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( + e.getGuild().getTextChannelById(rethink.getStarboardChannel(e.getGuild().getId())) + .retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) { + if (Integer.parseInt(rethink.getNeededStars(e.getGuild().getId())) <= finalStars) { msg2.editMessage(new MessageBuilder() - .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention()) + .setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention()) .setEmbed( new EmbedBuilder() .setAuthor(msg.getAuthor().getAsTag()) diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 8db4d9f..16f8529 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -17,12 +17,12 @@ public class VoiceLeaveListener extends ListenerAdapter { } @Override - public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) { - if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) { - audioManager.players.remove(event.getGuild().getId()); - audioManager.getPlayer(event.getGuild()).destroy(); - audioManager.getTrackManager(event.getGuild()).purgeQueue(); - event.getGuild().getAudioManager().closeAudioConnection(); + public void onGuildVoiceLeave(GuildVoiceLeaveEvent e) { + if (audioManager.hasPlayer(e.getGuild()) && e.getChannelLeft().getMembers().equals(e.getGuild().getSelfMember())) { + audioManager.players.remove(e.getGuild().getId()); + audioManager.getPlayer(e.getGuild()).destroy(); + audioManager.getTrackManager(e.getGuild()).purgeQueue(); + e.getGuild().getAudioManager().closeAudioConnection(); } } } From c094a0e5f146b0ee444970bad9d1b3a1a08e706f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:11:34 +0100 Subject: [PATCH 06/55] Request file lol --- .../java/com/bbn/hadder/utils/Request.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/com/bbn/hadder/utils/Request.java diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java new file mode 100644 index 0000000..10982dd --- /dev/null +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -0,0 +1,31 @@ +package com.bbn.hadder.utils; + +import okhttp3.OkHttpClient; +import okhttp3.Response; +import org.json.JSONObject; + +import java.io.IOException; + +/** + * @author Skidder / GregTCLTK + */ + +public class Request { + + public static String get(String url) { + + OkHttpClient caller = new OkHttpClient(); + okhttp3.Request request = new okhttp3.Request.Builder().url(url).build(); + + try { + Response response = caller.newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()); + JSONObject data = json.getJSONObject("data"); + JSONObject response1 = data.getJSONObject("response"); + return response1.toString().replace("{\"url\":\"", "").replace("\"}", ""); + } catch (IOException ex) { + ex.printStackTrace(); + } + return null; + } +} From 0eab70c78d300c4c555ae8456d8d716b5a9c1480 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:11:43 +0100 Subject: [PATCH 07/55] Integrate it lol2 --- .../bbn/hadder/commands/nsfw/AnalCommand.java | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index 04e0806..abbc812 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -7,39 +7,19 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class AnalCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build(); - - try { - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Anal") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } - + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Anal") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } From 63b9d1f96f90015d46f2c6080a003b92059a49e4 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:15:15 +0100 Subject: [PATCH 08/55] BDSM --- .../bbn/hadder/commands/nsfw/BDSMCommand.java | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index cf55c8d..69af8c0 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class BDSMCommand implements Command { @@ -20,25 +15,13 @@ public class BDSMCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd"); - try { - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("BDSM") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("BDSM") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From aec228543046de276950a2c1f4f000e32fdd4ada Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:18:35 +0100 Subject: [PATCH 09/55] Blowjob --- .../hadder/commands/nsfw/BlowjobCommand.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index e1da608..8d028fc 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -7,11 +7,8 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; +import com.bbn.hadder.utils.Request; -import java.io.IOException; public class BlowjobCommand implements Command { @@ -19,23 +16,13 @@ public class BlowjobCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://nekos.life/api/v2/img/blowjob").build(); + String url = Request.get("https://nekos.life/api/v2/img/blowjob"); - try { - - Response response = caller.newCall(request).execute(); - String url = response.body().string().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Blowjob") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Blowjob") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From e332f774326cf5c1da8bf9a5e962db67287e3d40 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:21:11 +0100 Subject: [PATCH 10/55] Boobs --- .../hadder/commands/nsfw/BoobsCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index dfe0a6f..6b53cc8 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class BoobsCommand implements Command { @@ -20,26 +15,13 @@ public class BoobsCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Boobs") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Boobs") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 68e676d04ed65be201e0f65d078458aa9befd48f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:22:04 +0100 Subject: [PATCH 11/55] Cum --- .../bbn/hadder/commands/nsfw/CumCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index b98c9b2..400c371 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class CumCommand implements Command { @@ -20,26 +15,13 @@ public class CumCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Cum") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + .setImage(url.replace("\"}", "")) + .setFooter("Cum") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 49f7b78aee007e49598b8bdd2425dc61f6a0b261 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 19:22:36 +0100 Subject: [PATCH 12/55] Fix cum --- src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 400c371..9f850ea 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -18,8 +18,8 @@ public class CumCommand implements Command { String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) .setFooter("Cum") .build()).queue(); From 1aec456d89670641f1fe010a52f7479efd2e04f7 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:21:27 +0100 Subject: [PATCH 13/55] Erotic --- .../hadder/commands/nsfw/EroticCommand.java | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 791f3b6..84dfe1c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -7,11 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class EroticCommand implements Command { @@ -19,23 +15,13 @@ public class EroticCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://nekos.life/api/v2/img/erok").build(); + String url = Request.get("https://nekos.life/api/v2/img/erok"); - try { - - Response response = caller.newCall(request).execute(); - String url = response.body().string().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Erotic") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Erotic") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From d53f92f57329b94a9fa53ee750aa7f6cc7d7c12e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:31:19 +0100 Subject: [PATCH 14/55] Fix v2 api requests --- src/main/java/com/bbn/hadder/utils/Request.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java index 10982dd..f0b658e 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -2,6 +2,7 @@ package com.bbn.hadder.utils; import okhttp3.OkHttpClient; import okhttp3.Response; +import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; @@ -20,9 +21,13 @@ public class Request { try { Response response = caller.newCall(request).execute(); JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - return response1.toString().replace("{\"url\":\"", "").replace("\"}", ""); + try { + JSONObject data = json.getJSONObject("data"); + JSONObject response1 = data.getJSONObject("response"); + return response1.toString().replace("{\"url\":\"", "").replace("\"}", ""); + } catch (Exception ignore) { + return json.getString("url"); + } } catch (IOException ex) { ex.printStackTrace(); } From db428212ca32405a0d2e5844c3f4ff5547a36fb9 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:31:29 +0100 Subject: [PATCH 15/55] Feet --- .../bbn/hadder/commands/nsfw/FeetCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 0637115..9e24f2a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class FeetCommand implements Command { @@ -20,26 +15,13 @@ public class FeetCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Feet") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Feet") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 42fc89d6c4870483874c850b1bc032871c600bcd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:32:56 +0100 Subject: [PATCH 16/55] Fingering --- .../commands/nsfw/FingeringCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 45fdd0a..d8bb4b3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class FingeringCommand implements Command { @@ -20,26 +15,13 @@ public class FingeringCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Fingering") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Fingering") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 1591a24ded31ccbee587504b37aa3520d0a99ab3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:34:09 +0100 Subject: [PATCH 17/55] Licking --- .../hadder/commands/nsfw/LickingCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index b52d4da..8872b75 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class LickingCommand implements Command { @@ -20,26 +15,13 @@ public class LickingCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Licking") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Licking") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 441e8ee984b8383e04a133a84e3c6284447e0805 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:34:53 +0100 Subject: [PATCH 18/55] Porn --- .../bbn/hadder/commands/nsfw/PornCommand.java | 34 +++++-------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 3efb550..0505aa5 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class PornCommand implements Command { @@ -20,26 +15,13 @@ public class PornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/").build(); - - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Porn") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); + + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) + .setImage(url.replace("\"}", "")) + .setFooter("Porn") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From e807f2c2ff355df3e2eb8c4d439056a39100fadc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:35:10 +0100 Subject: [PATCH 19/55] Fix porn --- src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 0505aa5..305c650 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -16,10 +16,10 @@ public class PornCommand implements Command { if (e.getTextChannel().isNSFW()) { String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); - + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) .setFooter("Porn") .build()).queue(); From 2fb0b90b2228e8a8f6e634b8ba4d4d3bf71dd1da Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:36:06 +0100 Subject: [PATCH 20/55] Pussy --- .../hadder/commands/nsfw/PussyCommand.java | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 78373d5..a9cc08b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -7,11 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class PussyCommand implements Command { @@ -19,23 +15,13 @@ public class PussyCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://nekos.life/api/v2/img/pussy").build(); + String url = Request.get("https://nekos.life/api/v2/img/pussy/"); - try { - - Response response = caller.newCall(request).execute(); - String url = response.body().string().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Pussy") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Pussy") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 362fcab0d4d0d16b2bee4a16b3401f3c65f3e72b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 20 Jan 2020 20:37:28 +0100 Subject: [PATCH 21/55] RandomPorn --- .../commands/nsfw/RandomPornCommand.java | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index ee1ba9f..4974779 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class RandomPornCommand implements Command { @@ -20,28 +15,14 @@ public class RandomPornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/") - .build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel() - .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), - url.replace("\"}", "")) - .setImage(url.replace("\"}", "")).setFooter("Random Porn").build()) - .queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel() + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Random Porn") + .build()).queue(); } else { e.getTextChannel() From 229d3f2a3f7fb06ea11e5abcb4ee01b208c86f45 Mon Sep 17 00:00:00 2001 From: Hax Date: Mon, 20 Jan 2020 21:54:16 +0100 Subject: [PATCH 22/55] Improved Database Performance, Added Test Echo Command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- src/main/java/com/bbn/hadder/Rethink.java | 139 +++++------------- .../java/com/bbn/hadder/RethinkServer.java | 117 +++++++++++++++ src/main/java/com/bbn/hadder/RethinkUser.java | 77 ++++++++++ .../com/bbn/hadder/commands/CommandEvent.java | 31 ++-- .../bbn/hadder/commands/fun/ClydeCommand.java | 2 +- .../hadder/commands/general/HelpCommand.java | 4 +- .../commands/moderation/EditRulesCommand.java | 8 +- .../moderation/InviteDetectCommand.java | 10 +- .../commands/moderation/NickCommand.java | 16 +- .../commands/moderation/PrefixCommand.java | 3 +- .../commands/moderation/RulesCommand.java | 6 +- .../commands/moderation/StarboardCommand.java | 8 +- .../hadder/commands/music/PlayCommand.java | 2 +- .../commands/owner/BlacklistCommand.java | 12 +- .../hadder/commands/owner/EchoCommand.java | 85 +++++++++++ .../commands/settings/LanguageCommand.java | 3 +- .../commands/settings/UserPrefixCommand.java | 3 +- .../com/bbn/hadder/core/CommandHandler.java | 9 +- .../bbn/hadder/listener/CommandListener.java | 11 +- .../hadder/listener/InviteLinkListener.java | 11 +- .../bbn/hadder/listener/MentionListener.java | 34 +++-- .../listener/PrivateMessageListener.java | 6 +- .../bbn/hadder/listener/RulesListener.java | 24 +-- .../hadder/listener/StarboardListener.java | 11 +- .../com/bbn/hadder/utils/MessageEditor.java | 13 +- 26 files changed, 454 insertions(+), 194 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/RethinkServer.java create mode 100644 src/main/java/com/bbn/hadder/RethinkUser.java create mode 100644 src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 917328f..cee4d42 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -103,7 +103,8 @@ public class Hadder { new BlacklistCommand(), new PauseCommand(), new LoopCommand(), - new BassCommand()), config, helpCommand); + new BassCommand(), + new EchoCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6191dff..ad0f80e 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -5,7 +5,9 @@ import com.rethinkdb.RethinkDB; import com.rethinkdb.gen.exc.ReqlOpFailedError; import com.rethinkdb.net.Connection; import org.json.JSONArray; +import org.json.JSONObject; +import java.lang.reflect.Field; import java.util.NoSuchElementException; /* @@ -66,28 +68,10 @@ public class Rethink { return r.table(table).get(wherevalue).getField(column).run(conn); } - public void update(String table, String where, String what, String value) { - try { - r.table(table).get(where).update(r.hashMap(what, value)).run(conn); - } catch (ClassCastException e) { - e.printStackTrace(); - } - } - - public void update(String table, String where, String what, int value) { - try { - r.table(table).get(where).update(r.hashMap(what, value)).run(conn); - } catch (ClassCastException e) { - e.printStackTrace(); - } - } - - public void update(String table, String where, String what, boolean value) { - try { - r.table(table).get(where).update(r.hashMap(what, value)).run(conn); - } catch (ClassCastException e) { - e.printStackTrace(); - } + public JSONObject getObjectByID(String table, String id) { + String response = r.table(table).get(id).toJson().run(conn); + System.out.println(response); + return new JSONObject(response); } public void insert(String table, Object object) { @@ -111,7 +95,7 @@ public class Rethink { try { r.tableCreate("server").run(conn); } catch (ReqlOpFailedError e) { - System.out.println(e.getMessage()); + System.out.println(e.getMessage()); } try { r.tableCreate("user").run(conn); @@ -125,22 +109,6 @@ public class Rethink { } } - public void setUserPrefix(String prefix, String user_id) { - this.update("user", user_id, "prefix", prefix); - } - - public String getUserPrefix(String id) { - return (String) this.getByID("user", id, "prefix"); - } - - public void setGuildPrefix(String prefix, String guild_id) { - this.update("server", guild_id, "prefix", prefix); - } - - public String getGuildPrefix(String id) { - return (String) this.getByID("server", id, "prefix"); - } - public void insertGuild(String id) { this.insert("server", r .hashMap("id", id) @@ -161,87 +129,54 @@ public class Rethink { .with("blacklisted", "none")); } - public void setBlackListed(String id, String commands) { - this.update("user", id, "blacklisted", commands); - } - - public String getBlackListed(String id) { - return (String) this.getByID("user", id, "blacklisted"); - } - - public void setNeededStars(String stars, String guild_id) { - this.update("server", guild_id, "neededstars", stars); - } - - public String getNeededStars(String guild_id) { - return (String) this.getByID("server", guild_id, "neededstars"); - } - - public void setStarboardChannel(String guild_id, String channel_id) { - this.update("server", guild_id, "starboard", channel_id); - } - - public String getStarboardChannel(String guild_id) { - return (String) this.getByID("server", guild_id, "starboard"); - } - + // TODO public boolean hasStarboardChannel(String guild_id) { return !this.getByID("server", guild_id, "starboard").equals(""); } - + // TODO public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboard_message_id)); } - + // TODO public String getStarboardMessage(String message_id) { return (String) this.getByID("stars", message_id, "starboardmsg"); } - + // TODO public void removeStarboardMessage(String message_id) { this.remove("stars", "id", message_id); } - + // TODO public boolean hasStarboardMessage(String message_id) { return this.getByID("stars", message_id, "guild") != null; } - public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) { - this.update("server", guild_id, "message_id", message_id); - this.update("server", guild_id, "role_id", role_id); - this.update("server", guild_id, "accept_emote", accept_emote); - this.update("server", guild_id, "decline_emote", decline_emote); + + public void pushServer(RethinkServer server) { + JSONObject object = new JSONObject(); + for (Field field : server.getClass().getDeclaredFields()) { + if (!field.getName().equals("rethink")) { + try { + object.put(field.getName(), field.get(server)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + r.table("server").get(server.getId()).update(object).run(conn); } - public String getRulesMID(String guild_id) { - return (String) this.getByID("server", guild_id, "message_id"); - } - - public String getRulesRID(String guild_id) { - return (String) this.getByID("server", guild_id, "role_id"); - } - - public String getRulesAEmote(String guild_id) { - return (String) this.getByID("server", guild_id, "accept_emote"); - } - - public String getRulesDEmote(String guild_id) { - return (String) this.getByID("server", guild_id, "decline_emote"); - } - - public void setInviteDetection(String guild_id, boolean b) { - this.update("server", guild_id, "invite_detect", b); - } - - public Boolean getInviteDetection(String guild_id) { - return (Boolean) this.getByID("server", guild_id, "invite_detect"); - } - - public void setLanguage(String user_id, String language) { - this.update("user", user_id, "language", language); - } - - public String getLanguage(String user_id) { - return (String) this.getByID("user", user_id, "language"); + public void pushUser(RethinkUser user) { + JSONObject object = new JSONObject(); + for (Field field : user.getClass().getDeclaredFields()) { + if (!field.getName().equals("rethink")) { + try { + object.put(field.getName(), field.get(user)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + r.table("user").get(user.getId()).update(object).run(conn); } } diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java new file mode 100644 index 0000000..69813c1 --- /dev/null +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -0,0 +1,117 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder; + +import org.json.JSONObject; + +import java.lang.reflect.Field; + +public class RethinkServer { + + private Rethink rethink; + + String accept_emote = ""; + String decline_emote = ""; + String id; + boolean invite_detect = false; + String message_id = ""; + String neededstars = "3"; + String prefix = "h."; + String role_id = ""; + String starboard = ""; + + public RethinkServer(JSONObject object, Rethink rethink) { + for (Field field : this.getClass().getDeclaredFields()) { + if (!field.getName().equals("rethink")) { + try { + if (object.has(field.getName())) + field.set(this, object.get(field.getName())); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + this.rethink = rethink; + } + + public String getAccept_emote() { + return accept_emote; + } + + public void setAccept_emote(String accept_emote) { + this.accept_emote = accept_emote; + } + + public String getDecline_emote() { + return decline_emote; + } + + public void setDecline_emote(String decline_emote) { + this.decline_emote = decline_emote; + } + + public String getId() { + return id; + } + + public boolean isInvite_detect() { + return invite_detect; + } + + public void setInvite_detect(boolean invite_detect) { + this.invite_detect = invite_detect; + } + + public String getMessage_id() { + return message_id; + } + + public void setMessage_id(String message_id) { + this.message_id = message_id; + } + + public String getNeededstars() { + return neededstars; + } + + public void setNeededstars(String neededstars) { + this.neededstars = neededstars; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getRole_id() { + return role_id; + } + + public void setRole_id(String role_id) { + this.role_id = role_id; + } + + public String getStarboard() { + return starboard; + } + + public void setStarboard(String starboard) { + this.starboard = starboard; + } + + public void updateRules(String message_id, String role_id, String accept_emote, String decline_emote) { + this.setMessage_id(message_id); + this.setRole_id(role_id); + this.setAccept_emote(accept_emote); + this.setDecline_emote(decline_emote); + } + + public void push() { + rethink.pushServer(this); + } +} diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java new file mode 100644 index 0000000..fd74fd4 --- /dev/null +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -0,0 +1,77 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder; + +import org.json.JSONObject; + +import java.lang.reflect.Field; + +public class RethinkUser { + + private Rethink rethink; + + String id; + String prefix = "h."; + String language = "en"; + String blacklisted = "none"; + + public RethinkUser(JSONObject object, Rethink rethink) { + for (Field field : this.getClass().getDeclaredFields()) { + if (!field.getName().equals("rethink")) { + try { + if (object.has(field.getName())) + field.set(this, object.getString(field.getName())); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + this.rethink = rethink; + } + + public RethinkUser(String id) { + this.id = id; + } + + public Rethink getRethink() { + return rethink; + } + + public void setRethink(Rethink rethink) { + this.rethink = rethink; + } + + public String getId() { + return id; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public String getBlacklisted() { + return blacklisted; + } + + public void setBlacklisted(String blacklisted) { + this.blacklisted = blacklisted; + } + + public void push() { + rethink.pushUser(this); + } +} \ No newline at end of file diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index dc6d222..e4f6ca3 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -1,6 +1,8 @@ package com.bbn.hadder.commands; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.core.CommandHandler; @@ -10,6 +12,7 @@ import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import org.json.JSONObject; import javax.annotation.Nonnull; @@ -22,8 +25,13 @@ public class CommandEvent extends MessageReceivedEvent { private MessageEditor messageEditor; private EventWaiter eventWaiter; private AudioManager audioManager; + private RethinkUser rethinkUser; + private RethinkServer rethinkServer; - public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) { + public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, + CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, + EventWaiter eventWaiter, AudioManager audioManager, RethinkUser rethinkUser, + RethinkServer rethinkServer) { super(api, responseNumber, message); this.rethink = rethink; this.config = config; @@ -32,17 +40,8 @@ public class CommandEvent extends MessageReceivedEvent { this.messageEditor = messageEditor; this.eventWaiter = eventWaiter; this.audioManager = audioManager; - } - - public CommandEvent(MessageReceivedEvent event, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) { - super(event.getJDA(), event.getResponseNumber(), event.getMessage()); - this.rethink = rethink; - this.config = config; - this.commandHandler = commandHandler; - this.helpCommand = helpCommand; - this.messageEditor = messageEditor; - this.eventWaiter = eventWaiter; - this.audioManager = audioManager; + this.rethinkUser = rethinkUser; + this.rethinkServer = rethinkServer; } public Rethink getRethink() { @@ -72,4 +71,12 @@ public class CommandEvent extends MessageReceivedEvent { public AudioManager getAudioManager() { return audioManager; } + + public RethinkServer getRethinkServer() { + return rethinkServer; + } + + public RethinkUser getRethinkUser() { + return rethinkUser; + } } diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index 26d9070..734ed14 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -28,7 +28,7 @@ public class ClydeCommand implements Command { if (args.length > 0) { if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { TextChannel channel = event.getMessage().getTextChannel(); - String content = event.getMessage().getContentRaw().replace(event.getRethink().getGuildPrefix(event.getGuild().getId()), "").replace(event.getRethink().getUserPrefix(event.getAuthor().getId()), "").replace("clyde", ""); + String content = event.getMessage().getContentRaw().replace(event.getRethinkServer().getPrefix(), "").replace(event.getRethinkUser().getPrefix(), "").replace("clyde", ""); Webhook webhook = channel.createWebhook(event.getConfig().getClydeName()).complete(); try { diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 7322465..45bf4fe 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -63,10 +63,10 @@ public class HelpCommand implements Command { StringBuilder b = new StringBuilder(); b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n"); if (cmd.usage() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n"); + b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n"); } if (cmd.example() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.example()); + b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.example()); } event.getChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index e276391..5336836 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -16,7 +16,7 @@ public class EditRulesCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - if (event.getRethink().getRulesMID(event.getGuild().getId()).length() == 18) { + if (event.getRethinkServer().getMessage_id().length() == 18) { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.message.title", "commands.moderation.editrules.message.description").build()).queue(); @@ -56,13 +56,13 @@ public class EditRulesCommand implements Command { } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.editrules.error.title", "", - "commands.moderation.editrules.error.description", event.getRethink().getGuildPrefix(event.getGuild().getId())).build()).queue(); + "commands.moderation.editrules.error.description", event.getRethinkServer().getPrefix()).build()).queue(); } } public void checkChannel(CommandEvent event, String rules, TextChannel channel) { try { - channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).queue(); + channel.retrieveMessageById(event.getRethinkServer().getMessage_id()).queue(); setRules(event, rules, channel); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.success.title", @@ -75,7 +75,7 @@ public class EditRulesCommand implements Command { } public void setRules(CommandEvent event, String rules, TextChannel channel) { - channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + channel.retrieveMessageById(event.getRethinkServer().getMessage_id()).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(rules) .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index a3b03b0..c470345 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -19,14 +19,15 @@ public class InviteDetectCommand implements Command { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!event.getRethink().getInviteDetection(event.getGuild().getId())) { - event.getRethink().setInviteDetection(event.getGuild().getId(), true); + if (!event.getRethinkServer().isInvite_detect()) { + event.getRethinkServer().setInvite_detect(true); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.activate.success.title", "commands.moderation.invitedetect.activate.success.description") .build()).queue(); + event.getRethinkServer().push(); } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, @@ -37,13 +38,14 @@ public class InviteDetectCommand implements Command { break; case "off": - if (event.getRethink().getInviteDetection(event.getGuild().getId())) { - event.getRethink().setInviteDetection(event.getGuild().getId(), false); + if (event.getRethinkServer().isInvite_detect()) { + event.getRethinkServer().setInvite_detect(false); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.deactivate.success.title", "commands.moderation.invitedetect.deactivate.success.description") .build()).queue(); + event.getRethinkServer().push(); } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index e15d9f9..97b5525 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -22,8 +22,8 @@ public class NickCommand implements Command { if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) { if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) { if (args.length > 1) { - if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + if (event.getMessage().getContentRaw().startsWith(event.getRethinkUser().getPrefix())) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -32,8 +32,8 @@ public class NickCommand implements Command { "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethinkServer().getPrefix())) { + event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -49,8 +49,8 @@ public class NickCommand implements Command { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + if (event.getMessage().getContentRaw().startsWith(event.getRethinkUser().getPrefix())) { + event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -58,8 +58,8 @@ public class NickCommand implements Command { "✅", "commands.moderation.nick.myself.success.description", "").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); + } else if (event.getMessage().getContentRaw().startsWith(event.getRethinkServer().getPrefix())) { + event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index 153e64f..4521183 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -13,7 +13,8 @@ public class PrefixCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length == 1) { if (!args[0].contains("\"")) { - event.getRethink().setGuildPrefix(args[0], event.getGuild().getId()); + event.getRethinkServer().setPrefix(args[0]); + event.getRethinkServer().push(); event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.prefix.success.title", diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 48951c5..fdeb831 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -160,7 +160,8 @@ public class RulesCommand implements Command { .build()).queue(); e.printStackTrace(); } - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); + event.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote.toString(), demote.toString()); + event.getRethinkServer().push(); } else { event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( @@ -205,7 +206,8 @@ public class RulesCommand implements Command { .build()).queue(); e.printStackTrace(); } - event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); + event.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote, demote); + event.getRethinkServer().push(); } else { event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index d3c97ff..c3de52b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -10,7 +10,7 @@ public class StarboardCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getMessage().getMentionedChannels().size()==1) { - event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId()); + event.getRethinkServer().setStarboard(event.getMessage().getMentionedChannels().get(0).getId()); event.getChannel().sendMessage( event.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -21,7 +21,7 @@ public class StarboardCommand implements Command { if (args.length>0) { TextChannel channel = event.getGuild().getTextChannelById(args[0]); if (channel!=null) { - event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId()); + event.getRethinkServer().setStarboard(channel.getId()); } } else { event.getHelpCommand().sendHelp(this, event); @@ -29,8 +29,10 @@ public class StarboardCommand implements Command { } if (args.length==2) { - event.getRethink().setNeededStars(args[1], event.getGuild().getId()); + event.getRethinkServer().setNeededstars(args[1]); } + + event.getRethinkServer().push(); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 1646769..5f020eb 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -18,7 +18,7 @@ public class PlayCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length > 0) { if (event.getMember().getVoiceState().inVoiceChannel()) { - String input = event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "play ", "").replaceFirst(event.getRethink().getUserPrefix(event.getAuthor().getId()) + "play ", ""); + String input = event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "play ", "").replaceFirst(event.getRethinkUser().getPrefix() + "play ", ""); try { new URL(input).toURI(); Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 5aa61f1..b2831ee 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -29,7 +29,7 @@ public class BlacklistCommand implements Command { case "add": if (args.length == 3) { Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethink().getBlackListed(member.getId()); + String blacklisted = event.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); @@ -37,19 +37,20 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethink().setBlackListed(member.getId(), newblacklisted); + event.getRethinkUser().setBlacklisted(newblacklisted); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); + event.getRethinkUser().push(); } break; case "remove": if (args.length == 3) { Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethink().getBlackListed(member.getId()); + String blacklisted = event.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); @@ -57,12 +58,13 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethink().setBlackListed(member.getId(), newblacklisted); + event.getRethinkUser().setBlacklisted(newblacklisted); event.getTextChannel().sendMessage( event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); + event.getRethinkUser().push(); } break; @@ -70,7 +72,7 @@ public class BlacklistCommand implements Command { StringBuilder stringBuilder = new StringBuilder(); for (User user : event.getJDA().getUsers()) { if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { - String blacklisted = event.getRethink().getBlackListed(user.getId()); + String blacklisted = event.getRethinkUser().getBlacklisted(); if (!"none".equals(blacklisted)) { stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); } diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java new file mode 100644 index 0000000..2420c12 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java @@ -0,0 +1,85 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder.commands.owner; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import net.dv8tion.jda.api.audio.*; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.managers.AudioManager; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.nio.ByteBuffer; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; + +public class EchoCommand implements Command { + @Override + public void executed(String[] args, CommandEvent event) { + Guild guild = event.getMember().getVoiceState().getChannel().getGuild(); + AudioManager audioManager = guild.getAudioManager(); + EchoHandler handler = new EchoHandler(); + if (!audioManager.isConnected()) { + audioManager.setSendingHandler(handler); + audioManager.setReceivingHandler(handler); + audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel()); + } else { + audioManager.closeAudioConnection(); + } + } + + @Override + public String[] labels() { + return new String[]{"echo"}; + } + + @Override + public String description() { + return null; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } + + public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler { + + private final Queue queue = new ConcurrentLinkedQueue<>(); + + @Override + public boolean canProvide() { + return !queue.isEmpty(); + } + + @Nullable + @Override + public ByteBuffer provide20MsAudio() { + byte[] data = queue.poll(); + return data == null ? null : ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer + } + + @Override + public boolean canReceiveCombined() { + return queue.size() < 10; + } + + @Override + public void handleCombinedAudio(@Nonnull CombinedAudio combinedAudio) { + if (combinedAudio.getUsers().isEmpty()) + return; + + byte[] data = combinedAudio.getAudioData(1.0f); // volume at 100% = 1.0 (50% = 0.5 / 55% = 0.55) + queue.add(data); + } + } +} diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 6a8ca22..0ae5bf3 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -42,7 +42,7 @@ public class LanguageCommand implements Command { } public void setLanguage(String language_code, String language, CommandEvent event) { - event.getRethink().setLanguage(event.getAuthor().getId(), language_code); + event.getRethinkUser().setLanguage(language_code); event.getTextChannel() .sendMessage( event.getMessageEditor() @@ -50,6 +50,7 @@ public class LanguageCommand implements Command { "", "commands.settings.language.success.description", language) .build()) .queue(); + event.getRethinkUser().push(); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index 19d52e9..33061ca 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -12,13 +12,14 @@ public class UserPrefixCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length == 1) { - event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); + event.getRethinkUser().setPrefix(args[0]); event.getTextChannel() .sendMessage(event.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "", "commands.settings.prefix.success.description", args[0]) .build()) .queue(); + event.getRethinkUser().push(); } else { event.getHelpCommand().sendHelp(this, event); } diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index c55a4da..7f5b1f1 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -1,6 +1,8 @@ package com.bbn.hadder.core; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; @@ -8,6 +10,7 @@ import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import org.json.JSONObject; import java.util.Arrays; import java.util.List; @@ -24,7 +27,7 @@ public class CommandHandler { this.helpCommand = helpCommand; } - public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager) { + public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager, RethinkUser rethinkUser, RethinkServer rethinkServer) { String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0]; for (Command cmd : commandList) { for (String label : cmd.labels()) { @@ -36,7 +39,7 @@ public class CommandHandler { if (args.length > 0 && args[0].equals("")) args = new String[0]; CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink, - config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()), new EventWaiter(), audioManager); + config, this, helpCommand, new MessageEditor(rethinkUser, event.getAuthor()), new EventWaiter(), audioManager, rethinkUser, rethinkServer); if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) { for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) { if (!perm.check(commandEvent)) { @@ -50,7 +53,7 @@ public class CommandHandler { } boolean run = true; - String blacklisted = rethink.getBlackListed(event.getAuthor().getId()); + String blacklisted = rethinkUser.getBlacklisted(); if (!"none".equals(blacklisted)) { for (String BLLabel : blacklisted.split(",")) { if (Arrays.asList(cmd.labels()).contains(BLLabel)) { diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index dff1e8b..c629a6b 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -1,11 +1,14 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.core.CommandHandler; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import org.json.JSONObject; /* * @author Skidder / GregTCLTK @@ -26,15 +29,19 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) { + RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", event.getAuthor().getId()), rethink); + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + rethinkUser.push(); + rethinkServer.push(); String[] prefixes = { - rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()), + rethinkUser.getPrefix(), rethinkServer.getPrefix(), event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(), event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", event.getGuild().getSelfMember().getAsMention().replace("@", "@!") }; for (String prefix : prefixes) { if (event.getMessage().getContentRaw().startsWith(prefix)) { - handler.handle(event, rethink, prefix, audioManager); + handler.handle(event, rethink, prefix, audioManager, rethinkUser, rethinkServer); return; } } diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index a12fad6..a85ef25 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.Message; @@ -28,10 +29,11 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) { + if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) { + } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { checkInvite(event.getMessage(), "discordapp.com/invite/"); } } @@ -55,10 +57,11 @@ public class InviteLinkListener extends ListenerAdapter { @Override public void onMessageUpdate(@Nonnull MessageUpdateEvent event) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { + if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) { + } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { checkInvite(event.getMessage(), "discordapp.com/invite/"); } } diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index cd14129..2bec984 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -1,6 +1,8 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; +import com.bbn.hadder.RethinkUser; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; @@ -19,20 +21,24 @@ public class MentionListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())|| - event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { - event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO) - .setTitle("Hello I'm Hadder.") - .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) - .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) - .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) - .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false) - .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false) - .build()).queue(); - } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { - int member = new Random().nextInt(event.getGuild().getMembers().size()-1); - if (member>0&&member 0 && member < event.getGuild().getMembers().size()) { + event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention() + " (Executed by: " + event.getAuthor().getAsTag() + ")").queue(); + } } } } diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index b9ab722..83849e2 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkUser; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.PrivateChannel; @@ -25,14 +26,15 @@ public class PrivateMessageListener extends ListenerAdapter { if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); + RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", "261083609148948488"), rethink); - Skidder.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) + Skidder.sendMessage(new MessageEditor(rethinkUser, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) .setTitle("New DM by " + event.getAuthor().getAsTag()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setDescription(event.getMessage().getContentRaw()) .setTimestamp(Instant.now()) .build()).queue(); - Hax.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) + Hax.sendMessage(new MessageEditor(rethinkUser, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) .setTitle("New DM by " + event.getAuthor().getAsTag()) .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .setDescription(event.getMessage().getContentRaw()) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 55f3ef6..a515198 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -5,6 +5,7 @@ package com.bbn.hadder.listener; */ import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; @@ -19,20 +20,21 @@ public class RulesListener extends ListenerAdapter { @Override public void onMessageReactionAdd(MessageReactionAddEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + if (event.getMessageId().equals(rethinkServer.getMessage_id()) && !event.getMember().getUser().isBot()) { if (event.getReactionEmote().isEmote()) { - if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { + if (rethinkServer.getAccept_emote().equals(event.getReactionEmote().getId())) { addRole(event); - } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { + } else if (rethinkServer.getDecline_emote().equals(event.getReactionEmote().getId())) { event.getReaction().removeReaction(event.getUser()).queue(); if (event.getGuild().getSelfMember().canInteract(event.getMember())) { event.getMember().kick().reason("Declined the rules"); } } } else if (event.getReactionEmote().isEmoji()) { - if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { + if (rethinkServer.getAccept_emote().equals(event.getReactionEmote().getEmoji())) { addRole(event); - } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { + } else if (rethinkServer.getDecline_emote().equals(event.getReactionEmote().getEmoji())) { event.getReaction().removeReaction(event.getUser()).queue(); if (event.getGuild().getSelfMember().canInteract(event.getMember())) { event.getMember().kick().reason("Declined the rules"); @@ -43,15 +45,17 @@ public class RulesListener extends ListenerAdapter { } private void addRole(MessageReactionAddEvent event) { - if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId())))) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); - } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethinkServer.getMessage_id()))) { + event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getMessage_id())).reason("Accepted rules").queue(); + } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); } @Override public void onMessageReactionRemove(MessageReactionRemoveEvent event) { - if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue(); + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + if (event.getMessageId().equals(rethinkServer.getMessage_id()) && !event.getMember().getUser().isBot()) { + event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Withdrawal of the acceptance of the rules").queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 38c5c52..a8a3699 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -1,6 +1,7 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkServer; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.entities.MessageReaction; @@ -31,9 +32,9 @@ public class StarboardListener extends ListenerAdapter { public void update(GenericMessageReactionEvent event) { if (event.getReaction().getReactionEmote().getName().equals("⭐")) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); if (!rethink.hasStarboardMessage(event.getMessageId())) { if (rethink.hasStarboardChannel(event.getGuild().getId())) { - event.getTextChannel().retrieveMessageById(event.getMessageId()).queue( msg -> { Integer stars = 0; @@ -43,8 +44,8 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= stars) { - event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) + if (Integer.parseInt(rethinkServer.getNeededstars()) <= stars) { + event.getGuild().getTextChannelById(rethinkServer.getStarboard()) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention()) .setEmbed( @@ -73,11 +74,11 @@ public class StarboardListener extends ListenerAdapter { } Integer finalStars = stars; - event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId())) + event.getGuild().getTextChannelById(rethinkServer.getStarboard()) .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethink.getNeededStars(event.getGuild().getId())) <= finalStars) { + if (Integer.parseInt(rethinkServer.getNeededstars()) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention()) .setEmbed( diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 4e923ee..0bbfb8a 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -1,6 +1,7 @@ package com.bbn.hadder.utils; import com.bbn.hadder.Rethink; +import com.bbn.hadder.RethinkUser; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; @@ -11,11 +12,11 @@ import java.util.ResourceBundle; public class MessageEditor { - private Rethink rethink; + private RethinkUser rethinkUser; private User user; - public MessageEditor(Rethink rethink, User user) { - this.rethink = rethink; + public MessageEditor(RethinkUser rethinkUser, User user) { + this.rethinkUser = rethinkUser; this.user = user; } @@ -34,7 +35,7 @@ public class MessageEditor { public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two, String description, String description_extra, String description_extra_two) { - String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null; + String language = (this.user!=null) ? rethinkUser.getLanguage() : null; EmbedBuilder eb = this.getDefaultSettings(type); if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two)); if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two)); @@ -105,11 +106,11 @@ public class MessageEditor { } public String getTerm(String string) { - return this.handle(rethink.getLanguage(user.getId()), string, "", ""); + return this.handle(rethinkUser.getLanguage(), string, "", ""); } public String getTerm(String string, String extra, String extra_two) { - return this.handle(rethink.getLanguage(user.getId()), string, extra, extra_two); + return this.handle(rethinkUser.getLanguage(), string, extra, extra_two); } private String handle(String language_code, String string, String extra, String extra_two) { From 22dacda2813763fb12ade25000677a7b5c3401bf Mon Sep 17 00:00:00 2001 From: Hax Date: Mon, 20 Jan 2020 21:55:10 +0100 Subject: [PATCH 23/55] Added Permissions --- src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java index 2420c12..2044fa3 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java @@ -6,6 +6,8 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.core.Perm; +import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.audio.*; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; @@ -17,6 +19,7 @@ import java.nio.ByteBuffer; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +@Perms(Perm.BOT_OWNER) public class EchoCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { From 6ddd228b5d2249eaa95288e481f6782a136cf3ed Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 07:44:03 +0100 Subject: [PATCH 24/55] Solo --- .../bbn/hadder/commands/nsfw/SoloCommand.java | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 4a04516..db20547 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class SoloCommand implements Command { @@ -20,26 +15,13 @@ public class SoloCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", "")) - .setImage(url.replace("\"}", "")) - .setFooter("Solo") - .build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Solo") + .build()).queue(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); From 9b6f48e58c9b2f32f094c7d53f705b897fddc718 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 07:45:47 +0100 Subject: [PATCH 25/55] Spank --- .../hadder/commands/nsfw/SpankCommand.java | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index 7ca2911..8425a01 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -7,12 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class SpankCommand implements Command { @@ -20,25 +15,13 @@ public class SpankCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/").build(); + String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); - try { - - Response response = caller.newCall(request).execute(); - JSONObject json = new JSONObject(response.body().string()); - JSONObject data = json.getJSONObject("data"); - JSONObject response1 = data.getJSONObject("response"); - String url = response1.toString().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), - url.replace("\"}", "")) - .setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Spank") + .build()).queue(); } else { e.getTextChannel() From e1b2ccf3d5fbed9f2dd351afe156b3f931fb6430 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 07:46:55 +0100 Subject: [PATCH 26/55] Trans --- .../hadder/commands/nsfw/TransCommand.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 93bffbf..24cfbcb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -7,11 +7,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -import java.io.IOException; +import com.bbn.hadder.utils.Request; public class TransCommand implements Command { @@ -19,22 +15,13 @@ public class TransCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - OkHttpClient caller = new OkHttpClient(); - Request request = new Request.Builder().url("https://nekos.life/api/v2/img/trap").build(); + String url = Request.get("https://nekos.life/api/v2/img/trap/"); - try { - - Response response = caller.newCall(request).execute(); - String url = response.body().string().replace("{\"url\":\"", ""); - - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) - .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), - url.replace("\"}", "")) - .setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue(); - - } catch (IOException ex) { - ex.printStackTrace(); - } + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) + .setImage(url) + .setFooter("Trans") + .build()).queue(); } else { e.getTextChannel() From 005f8ef35cb53a3b453a73e0a693bfed7ded6a12 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 08:00:51 +0100 Subject: [PATCH 27/55] Test copyright yk --- .../java/com/bbn/hadder/audio/AudioInfo.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioInfo.java b/src/main/java/com/bbn/hadder/audio/AudioInfo.java index 8aa35e9..7568b60 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioInfo.java +++ b/src/main/java/com/bbn/hadder/audio/AudioInfo.java @@ -1,12 +1,24 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.audio; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import net.dv8tion.jda.api.entities.Member; -/** - * @author Skidder / GregTCLTK - */ - public class AudioInfo { private final AudioTrack track; From e25908a13c4d8f58e81bed3bbf2e7fd61dfd36ce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 08:03:41 +0100 Subject: [PATCH 28/55] Test some avatar stuff --- src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index f3c0d76..29cd230 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -40,7 +40,8 @@ public class AvatarCommand implements Command { .build()).queue(); } else if (args[0].length() == 18) { try { - User u = e.getGuild().getMemberById(args[0]).getUser(); + User u = e.getJDA().getUserById(args[0]); + System.out.println(u); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, From a806d96bb09d29f1a7bb310ce66223585e895ccd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 08:13:12 +0100 Subject: [PATCH 29/55] #337 --- src/main/java/com/bbn/hadder/Hadder.java | 16 ++++++++++++++ src/main/java/com/bbn/hadder/Rethink.java | 19 ++++++++++++++--- .../com/bbn/hadder/audio/AudioManager.java | 20 ++++++++++++++---- .../hadder/audio/AudioPlayerSendHandler.java | 20 ++++++++++++++---- .../com/bbn/hadder/audio/TrackManager.java | 20 ++++++++++++++---- .../java/com/bbn/hadder/commands/Command.java | 18 +++++++++++++--- .../com/bbn/hadder/commands/CommandEvent.java | 16 ++++++++++++++ .../hadder/commands/fun/AvatarCommand.java | 20 ++++++++++++++---- .../bbn/hadder/commands/fun/ClydeCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/fun/GifCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/fun/MemeCommand.java | 18 +++++++++++++--- .../hadder/commands/general/AboutCommand.java | 18 +++++++++++++--- .../commands/general/EqualsCommand.java | 20 ++++++++++++++---- .../hadder/commands/general/HelpCommand.java | 16 ++++++++++++++ .../commands/general/InviteCommand.java | 20 ++++++++++++++---- .../hadder/commands/general/PingCommand.java | 18 +++++++++++++--- .../hadder/commands/misc/FeedbackCommand.java | 18 +++++++++++++--- .../hadder/commands/misc/GitHubCommand.java | 18 +++++++++++++--- .../commands/misc/ScreenShareCommand.java | 16 ++++++++++++++ .../commands/moderation/BanCommand.java | 18 +++++++++++++--- .../commands/moderation/ClearCommand.java | 18 +++++++++++++--- .../commands/moderation/EditRulesCommand.java | 20 ++++++++++++++---- .../moderation/InviteDetectCommand.java | 18 +++++++++++++--- .../commands/moderation/KickCommand.java | 18 +++++++++++++--- .../commands/moderation/NickCommand.java | 18 +++++++++++++--- .../commands/moderation/PrefixCommand.java | 16 ++++++++++++++ .../moderation/RegionChangeCommand.java | 18 +++++++++++++--- .../commands/moderation/RoleCommand.java | 16 ++++++++++++++ .../commands/moderation/RulesCommand.java | 18 +++++++++++++--- .../commands/moderation/StarboardCommand.java | 16 ++++++++++++++ .../hadder/commands/music/BassCommand.java | 14 ++++++++++++- .../hadder/commands/music/InfoCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/JoinCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/LeaveCommand.java | 18 +++++++++++++--- .../hadder/commands/music/LoopCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/PauseCommand.java | 18 +++++++++++++--- .../hadder/commands/music/PlayCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/QueueCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/SkipCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/StopCommand.java | 20 ++++++++++++++---- .../hadder/commands/music/VolumeCommand.java | 20 ++++++++++++++---- .../bbn/hadder/commands/nsfw/AnalCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/nsfw/BDSMCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/BlowjobCommand.java | 19 +++++++++++++---- .../hadder/commands/nsfw/BoobsCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/nsfw/CumCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/EroticCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/nsfw/FeetCommand.java | 18 +++++++++++++--- .../commands/nsfw/FingeringCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/LickingCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/nsfw/PornCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/PussyCommand.java | 18 +++++++++++++--- .../commands/nsfw/RandomPornCommand.java | 18 +++++++++++++--- .../bbn/hadder/commands/nsfw/SoloCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/SpankCommand.java | 18 +++++++++++++--- .../hadder/commands/nsfw/TransCommand.java | 18 +++++++++++++--- .../commands/owner/BlacklistCommand.java | 18 +++++++++++++--- .../hadder/commands/owner/EvalCommand.java | 18 +++++++++++++--- .../commands/owner/GuildLeaveCommand.java | 18 +++++++++++++--- .../hadder/commands/owner/RebootCommand.java | 18 +++++++++++++--- .../commands/owner/ShutdownCommand.java | 18 +++++++++++++--- .../hadder/commands/owner/TestCommand.java | 20 ++++++++++++++---- .../commands/settings/LanguageCommand.java | 18 +++++++++++++--- .../commands/settings/UserPrefixCommand.java | 18 +++++++++++++--- .../com/bbn/hadder/core/CommandHandler.java | 16 ++++++++++++++ src/main/java/com/bbn/hadder/core/Config.java | 16 ++++++++++++++ src/main/java/com/bbn/hadder/core/Perm.java | 21 ++++++++++++++----- src/main/java/com/bbn/hadder/core/Perms.java | 21 ++++++++++++++----- .../bbn/hadder/listener/CommandListener.java | 20 ++++++++++++++---- .../bbn/hadder/listener/GuildListener.java | 18 +++++++++++++--- .../hadder/listener/InviteLinkListener.java | 18 +++++++++++++--- .../bbn/hadder/listener/MentionListener.java | 16 ++++++++++++++ .../listener/PrivateMessageListener.java | 18 +++++++++++++--- .../bbn/hadder/listener/ReadyListener.java | 16 ++++++++++++++ .../bbn/hadder/listener/RulesListener.java | 18 +++++++++++++--- .../hadder/listener/StarboardListener.java | 16 ++++++++++++++ .../hadder/listener/VoiceLeaveListener.java | 20 ++++++++++++++---- .../java/com/bbn/hadder/utils/BotList.java | 18 +++++++++++++--- .../com/bbn/hadder/utils/EventWaiter.java | 16 ++++++++++++++ .../com/bbn/hadder/utils/MessageEditor.java | 16 ++++++++++++++ .../java/com/bbn/hadder/utils/Request.java | 20 ++++++++++++++---- 81 files changed, 1249 insertions(+), 223 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 917328f..b12eb65 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder; import com.bbn.hadder.audio.AudioManager; diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6191dff..027bde8 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder; import com.bbn.hadder.core.Config; @@ -8,9 +24,6 @@ import org.json.JSONArray; import java.util.NoSuchElementException; -/* - * @author Skidder / GregTCLTK - */ public class Rethink { private RethinkDB r = RethinkDB.r; diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index c40002a..051c479 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.audio; import com.bbn.hadder.commands.CommandEvent; @@ -19,10 +35,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -/** - * @author Skidder / GregTCLTK - */ - public class AudioManager { public Map> players = new HashMap<>(); diff --git a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java index 1863de2..cdbda28 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java +++ b/src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.audio; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; @@ -7,10 +23,6 @@ import net.dv8tion.jda.api.audio.AudioSendHandler; import javax.annotation.Nullable; import java.nio.ByteBuffer; -/** - * @author Skidder / GregTCLTK - */ - public class AudioPlayerSendHandler implements AudioSendHandler { private final AudioPlayer audioPlayer; diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index db3a475..b1c9946 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.audio; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; @@ -11,10 +27,6 @@ import net.dv8tion.jda.api.entities.VoiceChannel; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; -/** - * @author Skidder / GregTCLTK - */ - public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; diff --git a/src/main/java/com/bbn/hadder/commands/Command.java b/src/main/java/com/bbn/hadder/commands/Command.java index 23f7562..ae80476 100644 --- a/src/main/java/com/bbn/hadder/commands/Command.java +++ b/src/main/java/com/bbn/hadder/commands/Command.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands; + public interface Command { void executed(String[] args, CommandEvent e); diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index dc6d222..072ddc0 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index 29cd230..7d7348b 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.fun; import com.bbn.hadder.commands.Command; @@ -6,10 +22,6 @@ import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; -/** - * @author Skidder / GregTCLTK - */ - public class AvatarCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index cce4d03..d9ed365 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.fun; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.fun; + import club.minnced.discord.webhook.WebhookClient; import club.minnced.discord.webhook.WebhookClientBuilder; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index a63080e..22e4e14 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.fun; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.fun; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java index 9771ab9..9aa4aa2 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.fun; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.fun; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java index 5584911..e2f2f58 100644 --- a/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/AboutCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.general; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.general; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java index 01cd919..6cfb621 100644 --- a/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.general; import com.bbn.hadder.commands.Command; @@ -5,10 +21,6 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.MessageEditor; -/* - * @author Skidder / GregTCLTK - */ - public class EqualsCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 697d51d..1b51fe0 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.general; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java index 7fc1ff0..6127fce 100644 --- a/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/InviteCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.general; import com.bbn.hadder.Hadder; @@ -5,10 +21,6 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -/* - * @author Skidder / GregTCLTK - */ - public class InviteCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java index b9f301e..cfec2b2 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.general; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.general; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java index c354272..9592704 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.misc; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.misc; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.EventWaiter; diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 84fb9c8..343bc5c 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.misc; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.misc; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java index fa4ae3a..e8bb036 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.misc; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java index 86a5332..cb62cec 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java index 9f04cd0..290a6af 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index ff9e6f6..a949c9a 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.moderation; import com.bbn.hadder.commands.Command; @@ -7,10 +23,6 @@ import com.bbn.hadder.core.Perms; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.TextChannel; -/** - * @author Skidder / GregTCLTK - */ - @Perms(Perm.MANAGE_SERVER) public class EditRulesCommand implements Command { diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 333d3bf..ce692f4 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java index 608f25d..87db3de 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 441c737..df3b9fe 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index a1a6a7b..0cb2b75 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.moderation; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java index a5b594d..5ceed72 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java index 126ddee..3d774d7 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.moderation; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 0c49bdd..2521394 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.moderation; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.moderation; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 7824859..53d6789 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.moderation; import com.bbn.hadder.commands.Command; diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java index b6c16ff..2df554a 100644 --- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java @@ -1,5 +1,17 @@ /* - @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder.commands.music; diff --git a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java index 5f615f6..6096550 100644 --- a/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/InfoCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; @@ -5,10 +21,6 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; -/** - * @author Skidder / GregTCLTK - */ - public class InfoCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index e59cd89..aac598c 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; @@ -7,10 +23,6 @@ import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import net.dv8tion.jda.api.managers.AudioManager; -/* - * @author Skidder / GregTCLTK - */ - public class JoinCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index 3b1b663..d63cdb1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.music; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.music; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 5d37e70..1189845 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -/** - * @author Skidder / GregTCLTK - */ - public class LoopCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java index 8447d2a..baf55b0 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.music; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.music; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 7561253..75ac6e3 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; @@ -8,10 +24,6 @@ import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import java.net.URL; -/** - * @author Skidder / GregTCLTK - */ - public class PlayCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index 1375d34..56c1fc7 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.audio.AudioInfo; @@ -7,10 +23,6 @@ import com.bbn.hadder.utils.MessageEditor; import java.util.Set; -/** - * @author Skidder / GregTCLTK - */ - public class QueueCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index 6381254..9500988 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -/** - * @author Skidder / GregTCLTK - */ - public class SkipCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index ded6997..e11dfac 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -/** - * @author Skidder / GregTCLTK - */ - public class StopCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index 66ad14b..994224b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -/** - * @author Skidder / GregTCLTK - */ - public class VolumeCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index abbc812..77478ab 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 69af8c0..2f9d374 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 8d028fc..c58918b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -1,15 +1,26 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.Request; - public class BlowjobCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 6b53cc8..cefc67a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 9f850ea..653b43c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 84dfe1c..5cc8430 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 9e24f2a..31c9ea9 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index d8bb4b3..b0ede7e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index 8872b75..f97196e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 305c650..803124b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index a9cc08b..138bb9d 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 4974779..bb57021 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index db20547..776b00b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index 8425a01..c9ca9bb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 24cfbcb..73f0160 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.nsfw; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.nsfw; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index 89b7a12..3b18dfb 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.owner; - /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.owner; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java index 9e079ee..146d4a6 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.owner; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.owner; + import com.bbn.hadder.Hadder; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java index 95b0d9d..feb16ae 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.owner; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.owner; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java index ec1e335..7ae5ff9 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.owner; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.owner; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java index 42c895e..b8357a8 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.owner; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.owner; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; diff --git a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java index edce17c..b484b6a 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor.MessageType; -/* - * @author Skidder / GregTCLTK - */ - public class TestCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index f34b4ae..2e014e0 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.settings; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.settings; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index 0cd0fbd..48735f9 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.commands.settings; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.commands.settings; + import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index c55a4da..d612be5 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.core; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 942c382..b8fc4cf 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.core; import org.json.JSONObject; diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index 1ecb0f4..c3cb4e1 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -1,13 +1,24 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.core; import com.bbn.hadder.commands.CommandEvent; import net.dv8tion.jda.api.Permission; -/** - * @author Skidder / GregTCLTK - * @author Hax / Hax6775 / Schlauer_Hax - */ - public enum Perm { BOT_OWNER() { diff --git a/src/main/java/com/bbn/hadder/core/Perms.java b/src/main/java/com/bbn/hadder/core/Perms.java index 7fc8426..a5c2efe 100644 --- a/src/main/java/com/bbn/hadder/core/Perms.java +++ b/src/main/java/com/bbn/hadder/core/Perms.java @@ -1,13 +1,24 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.core; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * @author Skidder / GregTCLTK - * @author Hax / Hax6775 / Schlauer_Hax - */ - @Retention(RetentionPolicy.RUNTIME) public @interface Perms { Perm[] value() default {}; diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index 0bb77ef..f6e72bc 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; @@ -7,10 +23,6 @@ import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -/* - * @author Skidder / GregTCLTK - */ - public class CommandListener extends ListenerAdapter { private Rethink rethink; diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index fceee18..91204ca 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.listener; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.listener; + import com.bbn.hadder.Rethink; import com.bbn.hadder.core.Config; import com.bbn.hadder.utils.BotList; diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 380051c..4c842fe 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.listener; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.listener; + import com.bbn.hadder.Rethink; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 8d0ad7d..7388fac 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index 1a50396..681fd1d 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.listener; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.listener; + import com.bbn.hadder.Rethink; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.ChannelType; diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index 697e03d..51b3491 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 69eb321..f1bbca5 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.listener; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.listener; + import com.bbn.hadder.Rethink; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 2c4fb24..d15a839 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 16f8529..d53391f 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -1,13 +1,25 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.listener; import com.bbn.hadder.audio.AudioManager; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -/** - * @author Skidder / GregTCLTK - */ - public class VoiceLeaveListener extends ListenerAdapter { private AudioManager audioManager; diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index 580a457..8ea3167 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -1,9 +1,21 @@ -package com.bbn.hadder.utils; - /* - * @author Skidder / GregTCLTK + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +package com.bbn.hadder.utils; + import com.bbn.hadder.Hadder; import com.bbn.hadder.core.Config; import okhttp3.MediaType; diff --git a/src/main/java/com/bbn/hadder/utils/EventWaiter.java b/src/main/java/com/bbn/hadder/utils/EventWaiter.java index bc9ad89..525dd15 100644 --- a/src/main/java/com/bbn/hadder/utils/EventWaiter.java +++ b/src/main/java/com/bbn/hadder/utils/EventWaiter.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.utils; import net.dv8tion.jda.api.JDA; diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 4e923ee..c5b7cf3 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.utils; import com.bbn.hadder.Rethink; diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java index f0b658e..f8dc298 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -1,3 +1,19 @@ +/* + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.bbn.hadder.utils; import okhttp3.OkHttpClient; @@ -7,10 +23,6 @@ import org.json.JSONObject; import java.io.IOException; -/** - * @author Skidder / GregTCLTK - */ - public class Request { public static String get(String url) { From 3df08c5e1365e05b80443b211647f7eef2ec66b5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 08:23:27 +0100 Subject: [PATCH 30/55] Fix some event stuff --- .../bbn/hadder/commands/fun/ClydeCommand.java | 6 ++-- .../hadder/commands/general/HelpCommand.java | 4 +-- .../commands/moderation/EditRulesCommand.java | 18 +++++------ .../moderation/InviteDetectCommand.java | 18 +++++------ .../commands/moderation/NickCommand.java | 32 +++++++++---------- .../commands/moderation/PrefixCommand.java | 6 ++-- .../commands/moderation/RulesCommand.java | 8 ++--- .../commands/moderation/StarboardCommand.java | 16 +++++----- .../hadder/commands/music/PlayCommand.java | 4 +-- .../commands/owner/BlacklistCommand.java | 30 ++++++++--------- .../commands/settings/LanguageCommand.java | 8 ++--- .../commands/settings/UserPrefixCommand.java | 8 ++--- .../hadder/listener/StarboardListener.java | 18 +++++------ 13 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index 2b8e89d..e456876 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -38,9 +38,9 @@ public class ClydeCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { - TextChannel channel = event.getMessage().getTextChannel(); - String content = event.getMessage().getContentRaw().replace(event.getRethinkServer().getPrefix(), "").replace(event.getRethinkUser().getPrefix(), "").replace("clyde", ""); + if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) { + TextChannel channel = e.getMessage().getTextChannel(); + String content = e.getMessage().getContentRaw().replace(e.getRethinkServer().getPrefix(), "").replace(e.getRethinkUser().getPrefix(), "").replace("clyde", ""); Webhook webhook = channel.createWebhook(e.getConfig().getClydeName()).complete(); try { diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java index 89cc9d2..533e688 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -79,10 +79,10 @@ public class HelpCommand implements Command { StringBuilder b = new StringBuilder(); b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n"); if (cmd.usage() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n"); + b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n"); } if (cmd.example() != null) { - b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.example()); + b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getRethinkServer().getPrefix()).append(name).append(" ").append(cmd.example()); } e.getChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index b213b27..f0f4f6d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -27,9 +27,9 @@ import net.dv8tion.jda.api.entities.TextChannel; public class EditRulesCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getRethinkServer().getMessage_id().length() == 18) { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + public void executed(String[] args, CommandEvent e) { + if (e.getRethinkServer().getMessage_id().length() == 18) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.message.title", "commands.moderation.editrules.message.description").build()).queue(); @@ -68,15 +68,15 @@ public class EditRulesCommand implements Command { } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.editrules.error.title", "", - "commands.moderation.editrules.error.description", event.getRethinkServer().getPrefix()).build()).queue(); + "commands.moderation.editrules.error.description", e.getRethinkServer().getPrefix()).build()).queue(); } } public void checkChannel(CommandEvent e, String rules, TextChannel channel) { try { - channel.retrieveMessageById(event.getRethinkServer().getMessage_id()).queue(); - setRules(event, rules, channel); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).queue(); + setRules(e, rules, channel); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.success.title", "commands.moderation.editrules.success.description").build()).queue(); } catch (Exception ex) { @@ -86,8 +86,8 @@ public class EditRulesCommand implements Command { } } - public void setRules(CommandEvent event, String rules, TextChannel channel) { - channel.retrieveMessageById(event.getRethinkServer().getMessage_id()).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + public void setRules(CommandEvent e, String rules, TextChannel channel) { + channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(rules) .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index c2548ea..6df2eef 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -31,15 +31,15 @@ public class InviteDetectCommand implements Command { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!event.getRethinkServer().isInvite_detect()) { - event.getRethinkServer().setInvite_detect(true); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (!e.getRethinkServer().isInvite_detect()) { + e.getRethinkServer().setInvite_detect(true); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.activate.success.title", "commands.moderation.invitedetect.activate.success.description") .build()).queue(); - event.getRethinkServer().push(); + e.getRethinkServer().push(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, @@ -50,14 +50,14 @@ public class InviteDetectCommand implements Command { break; case "off": - if (event.getRethinkServer().isInvite_detect()) { - event.getRethinkServer().setInvite_detect(false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + if (e.getRethinkServer().isInvite_detect()) { + e.getRethinkServer().setInvite_detect(false); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.deactivate.success.title", "commands.moderation.invitedetect.deactivate.success.description") .build()).queue(); - event.getRethinkServer().push(); + e.getRethinkServer().push(); } else { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index 491da7d..2f838f7 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -34,20 +34,20 @@ public class NickCommand implements Command { if (!e.getMessage().getMentionedMembers().get(0).getId().equals(e.getGuild().getSelfMember().getId())) { if (e.getGuild().getSelfMember().canInteract(e.getMessage().getMentionedMembers().get(0))) { if (args.length > 1) { - if (event.getMessage().getContentRaw().startsWith(event.getRethinkUser().getPrefix())) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (e.getMessage().getContentRaw().startsWith(e.getRethinkUser().getPrefix())) { + e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", "commands.moderation.nick.success.description", e.getMessage().getMentionedMembers().get(0).getUser().getAsTag() ).build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethinkServer().getPrefix())) { - event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } else if (e.getMessage().getContentRaw().startsWith(e.getRethinkServer().getPrefix())) { + e.getGuild().modifyNickname(e.getMessage().getMentionedMembers().get(0), e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", @@ -61,19 +61,19 @@ public class NickCommand implements Command { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } } else { - if (event.getMessage().getContentRaw().startsWith(event.getRethinkUser().getPrefix())) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + if (e.getMessage().getContentRaw().startsWith(e.getRethinkUser().getPrefix())) { + e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethinkUser().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", "commands.moderation.nick.myself.success.description", "").build()).queue(); - } else if (event.getMessage().getContentRaw().startsWith(event.getRethinkServer().getPrefix())) { - event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( + } else if (e.getMessage().getContentRaw().startsWith(e.getRethinkServer().getPrefix())) { + e.getGuild().getSelfMember().modifyNickname(e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "nick " + args[0], "")).reason("Nicked by " + e.getAuthor().getAsTag()).queue(); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.nick.success.title", "✅", diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java index 45c891c..7d2293e 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java @@ -29,9 +29,9 @@ public class PrefixCommand implements Command { public void executed(String[] args, CommandEvent e) { if (args.length == 1) { if (!args[0].contains("\"")) { - event.getRethinkServer().setPrefix(args[0]); - event.getRethinkServer().push(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + e.getRethinkServer().setPrefix(args[0]); + e.getRethinkServer().push(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.prefix.success.title", "✅", diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 2c92d0f..00f81ac 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -172,8 +172,8 @@ public class RulesCommand implements Command { .build()).queue(); ex.printStackTrace(); } - event.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote.toString(), demote.toString()); - event.getRethinkServer().push(); + e.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote.toString(), demote.toString()); + e.getRethinkServer().push(); } else { e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( @@ -218,8 +218,8 @@ public class RulesCommand implements Command { .build()).queue(); ex.printStackTrace(); } - event.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote, demote); - event.getRethinkServer().push(); + e.getRethinkServer().updateRules(rules.getId(), role.getId(), aemote, demote); + e.getRethinkServer().push(); } else { e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index bd5ab44..0871a17 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -24,11 +24,11 @@ import net.dv8tion.jda.api.entities.TextChannel; public class StarboardCommand implements Command { @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMessage().getMentionedChannels().size()==1) { - event.getRethinkServer().setStarboard(event.getMessage().getMentionedChannels().get(0).getId()); - event.getChannel().sendMessage( - event.getMessageEditor().getMessage( + public void executed(String[] args, CommandEvent e) { + if (e.getMessage().getMentionedChannels().size()==1) { + e.getRethinkServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId()); + e.getChannel().sendMessage( + e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.starboard.success.title","") .build()) @@ -37,7 +37,7 @@ public class StarboardCommand implements Command { if (args.length>0) { TextChannel channel = e.getGuild().getTextChannelById(args[0]); if (channel!=null) { - event.getRethinkServer().setStarboard(channel.getId()); + e.getRethinkServer().setStarboard(channel.getId()); } } else { e.getHelpCommand().sendHelp(this, e); @@ -45,10 +45,10 @@ public class StarboardCommand implements Command { } if (args.length==2) { - event.getRethinkServer().setNeededstars(args[1]); + e.getRethinkServer().setNeededstars(args[1]); } - event.getRethinkServer().push(); + e.getRethinkServer().push(); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index f93cab2..794c960 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -29,8 +29,8 @@ public class PlayCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length > 0) { - if (event.getMember().getVoiceState().inVoiceChannel()) { - String input = event.getMessage().getContentRaw().replaceFirst(event.getRethinkServer().getPrefix() + "play ", "").replaceFirst(event.getRethinkUser().getPrefix() + "play ", ""); + if (e.getMember().getVoiceState().inVoiceChannel()) { + String input = e.getMessage().getContentRaw().replaceFirst(e.getRethinkServer().getPrefix() + "play ", "").replaceFirst(e.getRethinkUser().getPrefix() + "play ", ""); try { new URL(input).toURI(); Message msg = e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index d1ef9c4..edbabd6 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -40,8 +40,8 @@ public class BlacklistCommand implements Command { switch (args[0].toLowerCase()) { case "add": if (args.length == 3) { - Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethinkUser().getBlacklisted(); + Member member = e.getMessage().getMentionedMembers().get(0); + String blacklisted = e.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.addAll(Arrays.asList(args[1].split(","))); @@ -49,20 +49,20 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethinkUser().setBlacklisted(newblacklisted); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + e.getRethinkUser().setBlacklisted(newblacklisted); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); - event.getRethinkUser().push(); + e.getRethinkUser().push(); } break; case "remove": if (args.length == 3) { - Member member = event.getMessage().getMentionedMembers().get(0); - String blacklisted = event.getRethinkUser().getBlacklisted(); + Member member = e.getMessage().getMentionedMembers().get(0); + String blacklisted = e.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); commands.removeAll(Arrays.asList(args[1].split(","))); @@ -70,21 +70,21 @@ public class BlacklistCommand implements Command { ArrayList commandsWithoutDuplicates = new ArrayList<>(hashSet); String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none"); - event.getRethinkUser().setBlacklisted(newblacklisted); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + e.getRethinkUser().setBlacklisted(newblacklisted); + e.getTextChannel().sendMessage( + e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Removed Blacklisted Commands from User") .setDescription("Blacklisted commands: "+newblacklisted) .build()).queue(); - event.getRethinkUser().push(); + e.getRethinkUser().push(); } break; case "list": StringBuilder stringBuilder = new StringBuilder(); - for (User user : event.getJDA().getUsers()) { - if (!user.getId().equals(event.getJDA().getSelfUser().getId())) { - String blacklisted = event.getRethinkUser().getBlacklisted(); + for (User user : e.getJDA().getUsers()) { + if (!user.getId().equals(e.getJDA().getSelfUser().getId())) { + String blacklisted = e.getRethinkUser().getBlacklisted(); if (!"none".equals(blacklisted)) { stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n"); } diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 18cbe81..a97f3e2 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -53,16 +53,16 @@ public class LanguageCommand implements Command { } } - public void setLanguage(String language_code, String language, CommandEvent event) { - event.getRethinkUser().setLanguage(language_code); - event.getTextChannel() + public void setLanguage(String language_code, String language, CommandEvent e) { + e.getRethinkUser().setLanguage(language_code); + e.getTextChannel() .sendMessage( e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title", "", "commands.settings.language.success.description", language) .build()) .queue(); - event.getRethinkUser().push(); + e.getRethinkUser().push(); } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java index f9e96f3..b83da2c 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java @@ -24,14 +24,14 @@ public class UserPrefixCommand implements Command { public void executed(String[] args, CommandEvent e) { if (args.length == 1) { - event.getRethinkUser().setPrefix(args[0]); - event.getTextChannel() - .sendMessage(event.getMessageEditor() + e.getRethinkUser().setPrefix(args[0]); + e.getTextChannel() + .sendMessage(e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "", "commands.settings.prefix.success.description", args[0]) .build()) .queue(); - event.getRethinkUser().push(); + e.getRethinkUser().push(); } else { e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 15e136d..d05cc97 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -46,12 +46,12 @@ public class StarboardListener extends ListenerAdapter { update(e); } - public void update(GenericMessageReactionEvent event) { - if (event.getReaction().getReactionEmote().getName().equals("⭐")) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (!rethink.hasStarboardMessage(event.getMessageId())) { - if (rethink.hasStarboardChannel(event.getGuild().getId())) { - event.getTextChannel().retrieveMessageById(event.getMessageId()).queue( + public void update(GenericMessageReactionEvent e) { + if (e.getReaction().getReactionEmote().getName().equals("⭐")) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (!rethink.hasStarboardMessage(e.getMessageId())) { + if (rethink.hasStarboardChannel(e.getGuild().getId())) { + e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { Integer stars = 0; for (MessageReaction reaction : msg.getReactions()) { @@ -61,7 +61,7 @@ public class StarboardListener extends ListenerAdapter { } if (Integer.parseInt(rethinkServer.getNeededstars()) <= stars) { - event.getGuild().getTextChannelById(rethinkServer.getStarboard()) + e.getGuild().getTextChannelById(rethinkServer.getStarboard()) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention()) .setEmbed( @@ -90,8 +90,8 @@ public class StarboardListener extends ListenerAdapter { } Integer finalStars = stars; - event.getGuild().getTextChannelById(rethinkServer.getStarboard()) - .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue( + e.getGuild().getTextChannelById(rethinkServer.getStarboard()) + .retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( msg2 -> { if (Integer.parseInt(rethinkServer.getNeededstars()) <= finalStars) { From 17b63d09ef69f4b1fbe8f93b38a1474a367d0af6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 08:27:49 +0100 Subject: [PATCH 31/55] Update missing copyright --- src/main/java/com/bbn/hadder/RethinkServer.java | 14 +++++++++++++- src/main/java/com/bbn/hadder/RethinkUser.java | 16 ++++++++++++++-- .../bbn/hadder/listener/StarboardListener.java | 8 +++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 69813c1..e73a9d3 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder; diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index fd74fd4..26376f5 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder; @@ -74,4 +86,4 @@ public class RethinkUser { public void push() { rethink.pushUser(this); } -} \ No newline at end of file +} diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index d05cc97..bb8cdcc 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -53,7 +53,7 @@ public class StarboardListener extends ListenerAdapter { if (rethink.hasStarboardChannel(e.getGuild().getId())) { e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { - Integer stars = 0; + int stars = 0; for (MessageReaction reaction : msg.getReactions()) { if (reaction.getReactionEmote().getName().equals("⭐")) { stars = reaction.getCount(); @@ -82,14 +82,14 @@ public class StarboardListener extends ListenerAdapter { e.getTextChannel().retrieveMessageById(e.getMessageId()).queue( msg -> { - Integer stars = 0; + int stars = 0; for (MessageReaction reaction : msg.getReactions()) { if (reaction.getReactionEmote().getName().equals("⭐")) { stars = reaction.getCount(); } } - Integer finalStars = stars; + int finalStars = stars; e.getGuild().getTextChannelById(rethinkServer.getStarboard()) .retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( msg2 -> { @@ -108,10 +108,8 @@ public class StarboardListener extends ListenerAdapter { } } ); - } ); - } } } From 36c1d871ece15de2497507445e6f3748acf9cc63 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 15:33:15 +0100 Subject: [PATCH 32/55] Shut up debug lol --- src/main/java/com/bbn/hadder/Rethink.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 56f3191..6b2b137 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -83,7 +83,6 @@ public class Rethink { public JSONObject getObjectByID(String table, String id) { String response = r.table(table).get(id).toJson().run(conn); - System.out.println(response); return new JSONObject(response); } From db81e6cce9c3acc402ca8086e861b1d66230f965 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 15:33:50 +0100 Subject: [PATCH 33/55] #336 --- .../hadder/commands/fun/AvatarCommand.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index 7d7348b..7d36aa5 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -21,6 +21,12 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.json.JSONObject; + +import java.io.IOException; public class AvatarCommand implements Command { @@ -53,7 +59,6 @@ public class AvatarCommand implements Command { } else if (args[0].length() == 18) { try { User u = e.getJDA().getUserById(args[0]); - System.out.println(u); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -65,12 +70,30 @@ public class AvatarCommand implements Command { .setFooter(u.getAsTag()) .build()).queue(); } catch (NullPointerException ignore) { - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, - "commands.fun.avatar.error.title", - "commands.fun.avatar.error.description" - ).build()).queue(); - } + OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build(); + + try { + Response response = client.newCall(request).execute(); + JSONObject json = new JSONObject(response.body().string()); + String url = "https://cdn.discordapp.com/avatars/" + args[0] + "/" + json.getString("avatar") + ".png"; + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.fun.avatar.success.title", + json.getString("username") + "#" + json.getString("discriminator"), + "", + "") + .setImage(url) + .setFooter(json.getString("username") + "#" + json.getString("discriminator")) + .build()).queue(); + } catch (IOException ex) { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.fun.avatar.error.title", + "commands.fun.avatar.error.description" + ).build()).queue(); + } + } } else { e.getHelpCommand().sendHelp(this, e); } From 511ae6e13b51a851a09a6414f09cd9198926cc2d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 16:54:13 +0100 Subject: [PATCH 34/55] Fix error message --- src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index 7d36aa5..bd61621 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -24,6 +24,7 @@ import net.dv8tion.jda.api.entities.User; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; +import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; @@ -87,11 +88,13 @@ public class AvatarCommand implements Command { .setImage(url) .setFooter(json.getString("username") + "#" + json.getString("discriminator")) .build()).queue(); - } catch (IOException ex) { + } catch (JSONException ex) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.fun.avatar.error.title", "commands.fun.avatar.error.description" ).build()).queue(); + } catch (Exception ex) { + ex.printStackTrace(); } } } else { From 1e0969d42c2c844427cc31d03609f22dd6c16e7e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 17:12:34 +0100 Subject: [PATCH 35/55] It's user time my friends --- .../hadder/commands/fun/AvatarCommand.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index bd61621..ffc9c76 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -19,7 +19,6 @@ package com.bbn.hadder.commands.fun; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -27,35 +26,33 @@ import okhttp3.Response; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; - public class AvatarCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 0) { - Member member = e.getMember(); + User u = e.getAuthor(); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.fun.avatar.success.title", - member.getUser().getAsTag(), + u.getAsTag(), "", "") - .setImage(member.getUser().getAvatarUrl()) - .setFooter(member.getUser().getAsTag()) + .setImage(u.getAvatarUrl()) + .setFooter(u.getAsTag()) .build()).queue(); - } else if (e.getMessage().getMentionedMembers().size() == 1) { - Member member = e.getMessage().getMentionedMembers().get(0); + } else if (e.getMessage().getMentionedUsers().size() == 1) { + User u = e.getMessage().getMentionedUsers().get(0); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.fun.avatar.success.title", - member.getUser().getAsTag(), + u.getAsTag(), "", "") - .setImage(member.getUser().getAvatarUrl()) - .setFooter(member.getUser().getAsTag()) + .setImage(u.getAvatarUrl()) + .setFooter(u.getAsTag()) .build()).queue(); } else if (args[0].length() == 18) { try { From 115389e272f105e308b5b09fed84dd4c2cd3b2e5 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 17:18:28 +0100 Subject: [PATCH 36/55] Codacy --- src/main/java/com/bbn/hadder/commands/CommandEvent.java | 1 - src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java | 1 - src/main/java/com/bbn/hadder/core/CommandHandler.java | 1 - src/main/java/com/bbn/hadder/listener/CommandListener.java | 1 - src/main/java/com/bbn/hadder/utils/MessageEditor.java | 1 - src/main/java/com/bbn/hadder/utils/Request.java | 1 - 6 files changed, 6 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java index 91cb6ea..90b1d8b 100644 --- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java +++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java @@ -28,7 +28,6 @@ import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import org.json.JSONObject; import javax.annotation.Nonnull; diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java index 2044fa3..fe6f8d1 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java @@ -10,7 +10,6 @@ import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.audio.*; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.managers.AudioManager; import javax.annotation.Nonnull; diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index 49d9600..5f2029c 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -26,7 +26,6 @@ import com.bbn.hadder.commands.general.HelpCommand; import com.bbn.hadder.utils.EventWaiter; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import org.json.JSONObject; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index b8dc44a..fa751ea 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -24,7 +24,6 @@ import com.bbn.hadder.core.CommandHandler; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import org.json.JSONObject; public class CommandListener extends ListenerAdapter { diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 5bf9369..fcbbbe9 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -16,7 +16,6 @@ package com.bbn.hadder.utils; -import com.bbn.hadder.Rethink; import com.bbn.hadder.RethinkUser; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java index f8dc298..7fc035a 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -18,7 +18,6 @@ package com.bbn.hadder.utils; import okhttp3.OkHttpClient; import okhttp3.Response; -import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; From a939d29c39f406d9cd5c7e6a9217ebf494fb6c2f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 17:31:09 +0100 Subject: [PATCH 37/55] 200IQ --- src/main/java/com/bbn/hadder/utils/Request.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java index 7fc035a..67a59dc 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -35,7 +35,7 @@ public class Request { try { JSONObject data = json.getJSONObject("data"); JSONObject response1 = data.getJSONObject("response"); - return response1.toString().replace("{\"url\":\"", "").replace("\"}", ""); + return response1.getString("url"); } catch (Exception ignore) { return json.getString("url"); } From e3f835c9ca87cc47c83227a052a5613d61d08fbc Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 17:44:38 +0100 Subject: [PATCH 38/55] Finish #337 --- .../Translations/Translations_de.properties | 14 +++++++++++++- .../Translations/Translations_en.properties | 14 +++++++++++++- .../Translations/Translations_es.properties | 14 +++++++++++++- .../Translations/Translations_fr.properties | 14 +++++++++++++- .../Translations/Translations_ru.properties | 14 +++++++++++++- .../Translations/Translations_tr.properties | 14 +++++++++++++- .../Translations/Translations_zh.properties | 14 +++++++++++++- 7 files changed, 91 insertions(+), 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 3f81bbf..3380cee 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 53ffd50..bef41a8 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 5ca0715..2dd528a 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 5ca0715..2dd528a 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 5ca0715..2dd528a 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 5ca0715..2dd528a 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 5ca0715..2dd528a 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -1,5 +1,17 @@ # -# @author Skidder / GregTCLTK +# Copyright 2019-2020 GregTCLTK and Schlauer-Hax +# +# Licensed under the GNU Affero General Public License, Version 3.0; +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.gnu.org/licenses/agpl-3.0.en.html +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # Hadder = Hadder From 5bba1ab9c3c4bccf5adc62e8ee053ae101d15070 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 21 Jan 2020 19:04:04 +0100 Subject: [PATCH 39/55] Rename event to e in Perm class --- .../hadder/commands/owner/EchoCommand.java | 76 +++++++++++-------- src/main/java/com/bbn/hadder/core/Perm.java | 42 +++++----- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java index fe6f8d1..e5d263f 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder.commands.owner; @@ -20,6 +32,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; @Perms(Perm.BOT_OWNER) public class EchoCommand implements Command { + @Override public void executed(String[] args, CommandEvent event) { Guild guild = event.getMember().getVoiceState().getChannel().getGuild(); @@ -34,6 +47,37 @@ public class EchoCommand implements Command { } } + public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler { + + private final Queue queue = new ConcurrentLinkedQueue<>(); + + @Override + public boolean canProvide() { + return !queue.isEmpty(); + } + + @Nullable + @Override + public ByteBuffer provide20MsAudio() { + byte[] data = queue.poll(); + return data == null ? null : ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer + } + + @Override + public boolean canReceiveCombined() { + return queue.size() < 10; + } + + @Override + public void handleCombinedAudio(@Nonnull CombinedAudio combinedAudio) { + if (combinedAudio.getUsers().isEmpty()) + return; + + byte[] data = combinedAudio.getAudioData(1.0f); // volume at 100% = 1.0 (50% = 0.5 / 55% = 0.55) + queue.add(data); + } + } + @Override public String[] labels() { return new String[]{"echo"}; @@ -54,34 +98,4 @@ public class EchoCommand implements Command { return null; } - public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler { - - private final Queue queue = new ConcurrentLinkedQueue<>(); - - @Override - public boolean canProvide() { - return !queue.isEmpty(); - } - - @Nullable - @Override - public ByteBuffer provide20MsAudio() { - byte[] data = queue.poll(); - return data == null ? null : ByteBuffer.wrap(data); // Wrap this in a java.nio.ByteBuffer - } - - @Override - public boolean canReceiveCombined() { - return queue.size() < 10; - } - - @Override - public void handleCombinedAudio(@Nonnull CombinedAudio combinedAudio) { - if (combinedAudio.getUsers().isEmpty()) - return; - - byte[] data = combinedAudio.getAudioData(1.0f); // volume at 100% = 1.0 (50% = 0.5 / 55% = 0.55) - queue.add(data); - } - } } diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index c3cb4e1..042412e 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -23,64 +23,64 @@ public enum Perm { BOT_OWNER() { @Override - public boolean check(CommandEvent event) { - return event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_MESSAGES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MESSAGE_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, EMBED_MESSAGES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, BAN_MEMBERS { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.BAN_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, KICK_MEMBERS { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.KICK_MEMBERS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_SERVER { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_SERVER) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_ROLES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_ROLES) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_NICKNAMES { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.NICKNAME_MANAGE) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, ADMINISTRATOR { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.ADMINISTRATOR) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.ADMINISTRATOR) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }, MANAGE_WEBHOOKS { @Override - public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + public boolean check(CommandEvent e) { + return e.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || e.getConfig().getOwners().contains(e.getAuthor().getIdLong()); } }; - public abstract boolean check(CommandEvent event); + public abstract boolean check(CommandEvent e); } From 971db6625bb2720aae0969dd26508a65d1a29396 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 13:34:21 +0000 Subject: [PATCH 40/55] Bump github-api from 1.101 to 1.102 Bumps github-api from 1.101 to 1.102. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 470de55..21f5f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.kohsuke github-api - 1.101 + 1.102 com.sedmelluq From b7d0d365b67ac7b9016c7dc0a268c8893638b5f0 Mon Sep 17 00:00:00 2001 From: Hax Date: Wed, 22 Jan 2020 21:33:54 +0100 Subject: [PATCH 41/55] =?UTF-8?q?OFJSEfpl=C3=B6mnsdf#g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{owner => music}/EchoCommand.java | 16 +-- .../hadder/commands/music/RecordCommand.java | 112 ++++++++++++++++++ 2 files changed, 114 insertions(+), 14 deletions(-) rename src/main/java/com/bbn/hadder/commands/{owner => music}/EchoCommand.java (78%) create mode 100644 src/main/java/com/bbn/hadder/commands/music/RecordCommand.java diff --git a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java similarity index 78% rename from src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java rename to src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index e5d263f..918ac40 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -1,20 +1,8 @@ /* - * Copyright 2019-2020 GregTCLTK and Schlauer-Hax - * - * Licensed under the GNU Affero General Public License, Version 3.0; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.gnu.org/licenses/agpl-3.0.en.html - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * @author Hax / Hax6775 / Schlauer_Hax */ -package com.bbn.hadder.commands.owner; +package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; diff --git a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java new file mode 100644 index 0000000..875cf53 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java @@ -0,0 +1,112 @@ +/* + * @author Hax / Hax6775 / Schlauer_Hax + */ + +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.core.Perm; +import com.bbn.hadder.core.Perms; +import net.dv8tion.jda.api.audio.AudioReceiveHandler; +import net.dv8tion.jda.api.audio.AudioSendHandler; +import net.dv8tion.jda.api.audio.CombinedAudio; +import net.dv8tion.jda.api.audio.UserAudio; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.managers.AudioManager; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.sound.sampled.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; +import java.util.Queue; +import java.util.UUID; +import java.util.concurrent.ConcurrentLinkedQueue; + +@Perms(Perm.BOT_OWNER) +public class RecordCommand implements Command { + + private final HashMap> queue = new HashMap>(); + + @Override + public void executed(String[] args, CommandEvent event) { + Guild guild = event.getMember().getVoiceState().getChannel().getGuild(); + AudioManager audioManager = guild.getAudioManager(); + EchoHandler handler = new EchoHandler(queue); + if (!audioManager.isConnected()) { + audioManager.setSendingHandler(handler); + audioManager.setReceivingHandler(handler); + audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel()); + } else { + for (Map.Entry> key : queue.entrySet()) { + File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav"); + + + } + } + } + + public static class EchoHandler implements AudioSendHandler, AudioReceiveHandler { + + private HashMap> queue; + + public EchoHandler(HashMap> queue) { + this.queue = queue; + } + + @Override + public boolean canProvide() { + return false; + } + + @Nullable + @Override + public ByteBuffer provide20MsAudio() { + return null; + } + + @Override + public void handleUserAudio(@Nonnull UserAudio userAudio) { + if (queue.containsKey(userAudio.getUser().getId())) { + queue.get(userAudio.getUser().getId()).add(userAudio.getAudioData(1.0f)); + } else { + Queue newqueue = new ConcurrentLinkedQueue<>(); + newqueue.add(userAudio.getAudioData(1.0f)); + queue.put(userAudio.getUser().getId(), newqueue); + } + } + + public HashMap> getQueue() { + return queue; + } + } + + @Override + public String[] labels() { + return new String[]{"echo"}; + } + + @Override + public String description() { + return null; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } + +} From 838e2103b9c3d4b8aeda9ddfe42182fd79a15397 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 23 Jan 2020 08:11:33 +0100 Subject: [PATCH 42/55] Fix --- src/main/java/com/bbn/hadder/listener/RulesListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index d056011..53becb6 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -58,8 +58,8 @@ public class RulesListener extends ListenerAdapter { private void addRole(MessageReactionAddEvent event) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethinkServer.getMessage_id()))) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getMessage_id())).reason("Accepted rules").queue(); + if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethinkServer.getRole_id()))) { + event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); } From 6b8d9d3882599863f59dd1fc3b4b9ad5d3bb11be Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 23 Jan 2020 08:19:25 +0100 Subject: [PATCH 43/55] Add two error messages --- .../bbn/hadder/listener/CommandListener.java | 53 ++++++++++++++----- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index fa751ea..12cd584 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -21,10 +21,15 @@ import com.bbn.hadder.RethinkServer; import com.bbn.hadder.RethinkUser; import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.core.CommandHandler; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import java.awt.*; +import java.time.Instant; + public class CommandListener extends ListenerAdapter { private Rethink rethink; @@ -40,21 +45,41 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(MessageReceivedEvent event) { if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) { - RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", event.getAuthor().getId()), rethink); - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - rethinkUser.push(); - rethinkServer.push(); - String[] prefixes = { - rethinkUser.getPrefix(), rethinkServer.getPrefix(), - event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(), - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") - }; - for (String prefix : prefixes) { - if (event.getMessage().getContentRaw().startsWith(prefix)) { - handler.handle(event, rethink, prefix, audioManager, rethinkUser, rethinkServer); - return; + if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_WRITE)) { + if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { + RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", event.getAuthor().getId()), rethink); + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + rethinkUser.push(); + rethinkServer.push(); + String[] prefixes = { + rethinkUser.getPrefix(), rethinkServer.getPrefix(), + event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(), + event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", + event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + }; + for (String prefix : prefixes) { + if (event.getMessage().getContentRaw().startsWith(prefix)) { + handler.handle(event, rethink, prefix, audioManager, rethinkUser, rethinkServer); + return; + } + } + } else { + event.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + .setTitle("No permission") + .setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") + .setTimestamp(Instant.now()) + .build()).queue(); } + } else { + event.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + .setTitle("No permission") + .setDescription("I need the `MESSAGE WRITE` permission in order to work!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") + .setTimestamp(Instant.now()) + .build()).queue(); } } } From 125b2451312aeee64dc49c4aa9b293ef11c260c6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 23 Jan 2020 08:27:42 +0100 Subject: [PATCH 44/55] DM error message --- .../bbn/hadder/listener/PrivateMessageListener.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index 66eff6e..bfdcad1 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -19,11 +19,13 @@ package com.bbn.hadder.listener; import com.bbn.hadder.Rethink; import com.bbn.hadder.RethinkUser; import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.ChannelType; import net.dv8tion.jda.api.entities.PrivateChannel; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; +import java.awt.*; import java.time.Instant; public class PrivateMessageListener extends ListenerAdapter { @@ -52,6 +54,14 @@ public class PrivateMessageListener extends ListenerAdapter { .setDescription(event.getMessage().getContentRaw()) .setTimestamp(Instant.now()) .build()).queue(); + + event.getChannel().sendMessage(new EmbedBuilder() + .setTitle("No DM support") + .setDescription("You have to execute your commands on a guild!") + .setColor(Color.RED) + .setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png") + .setTimestamp(Instant.now()) + .build()).queue(); } } } From a9f5aa9f05404117d1718d1a63f74617bbbcf04c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 23 Jan 2020 08:31:49 +0100 Subject: [PATCH 45/55] Bro... --- .../com/bbn/hadder/commands/music/EchoCommand.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java index 918ac40..268498b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/EchoCommand.java @@ -1,5 +1,17 @@ /* - * @author Hax / Hax6775 / Schlauer_Hax + * Copyright 2019-2020 GregTCLTK and Schlauer-Hax + * + * Licensed under the GNU Affero General Public License, Version 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gnu.org/licenses/agpl-3.0.en.html + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.bbn.hadder.commands.music; From e9a1aee13b5a26c439186bb8903c43c0b82def4b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 23 Jan 2020 08:40:40 +0100 Subject: [PATCH 46/55] Changes --- .../java/com/bbn/hadder/commands/moderation/RulesCommand.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java index 00f81ac..48d54d2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java @@ -56,13 +56,15 @@ public class RulesCommand implements Command { try { TextChannel channel = e1.getGuild().getTextChannelsByName(e1.getMessage().getContentRaw(), true).get(0); createRules(e, e1, channel); - } catch (Exception ex) { + } catch (NullPointerException ex) { e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, "commands.moderation.rules.channel.error.title", "commands.moderation.rules.channel.error.description") .build()).queue(); + } catch (Exception ex) { + ex.printStackTrace(); } } }, e.getJDA(), e.getAuthor()); From d09da0f9a4ddc7cdd24f16f328e43d1b14d1cbd1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 13:35:15 +0000 Subject: [PATCH 47/55] Bump github-api from 1.102 to 1.103 Bumps github-api from 1.102 to 1.103. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21f5f5f..5a6fbf3 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ org.kohsuke github-api - 1.102 + 1.103 com.sedmelluq From 8d1dd4b175b3e56672f40ed5dc31022241927851 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2020 13:33:03 +0000 Subject: [PATCH 48/55] Bump JDA from 4.1.0_99 to 4.1.1_101 Bumps JDA from 4.1.0_99 to 4.1.1_101. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a6fbf3..256bfda 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ net.dv8tion JDA - 4.1.0_99 + 4.1.1_101 org.json From 1787f67ab30fcb03ba6a2dbf32bc7f81b16ad3cd Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 16:25:23 +0100 Subject: [PATCH 49/55] Rename get --- src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java | 2 +- .../java/com/bbn/hadder/commands/nsfw/FingeringCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java | 2 +- .../java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java | 2 +- src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java | 2 +- src/main/java/com/bbn/hadder/utils/Request.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index 77478ab..2bb4cf1 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -26,7 +26,7 @@ public class AnalCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) .setImage(url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 2f9d374..501bd69 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -27,7 +27,7 @@ public class BDSMCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index c58918b..0687fbc 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -27,7 +27,7 @@ public class BlowjobCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://nekos.life/api/v2/img/blowjob"); + String url = Request.getNSFW("https://nekos.life/api/v2/img/blowjob"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index cefc67a..1fbad2b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -27,7 +27,7 @@ public class BoobsCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 653b43c..26a0a08 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -27,7 +27,7 @@ public class CumCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 5cc8430..2e6a3cb 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -27,7 +27,7 @@ public class EroticCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://nekos.life/api/v2/img/erok"); + String url = Request.getNSFW("https://nekos.life/api/v2/img/erok"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 31c9ea9..2c8ed8e 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -27,7 +27,7 @@ public class FeetCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index b0ede7e..2244b6b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -27,7 +27,7 @@ public class FingeringCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index f97196e..ae9363c 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -27,7 +27,7 @@ public class LickingCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 803124b..66763b6 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -27,7 +27,7 @@ public class PornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 138bb9d..6189d24 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -27,7 +27,7 @@ public class PussyCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://nekos.life/api/v2/img/pussy/"); + String url = Request.getNSFW("https://nekos.life/api/v2/img/pussy/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index bb57021..a326762 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -27,7 +27,7 @@ public class RandomPornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); e.getTextChannel() .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 776b00b..3ba58ef 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -27,7 +27,7 @@ public class SoloCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index c9ca9bb..baa99b9 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -27,7 +27,7 @@ public class SpankCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); + String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 73f0160..176a796 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -27,7 +27,7 @@ public class TransCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.get("https://nekos.life/api/v2/img/trap/"); + String url = Request.getNSFW("https://nekos.life/api/v2/img/trap/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Request.java index 67a59dc..acb2c3f 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Request.java @@ -24,7 +24,7 @@ import java.io.IOException; public class Request { - public static String get(String url) { + public static String getNSFW(String url) { OkHttpClient caller = new OkHttpClient(); okhttp3.Request request = new okhttp3.Request.Builder().url(url).build(); From e5884de59b3dcd5c9ed6acafd1cc6484e2b84002 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:01:52 +0100 Subject: [PATCH 50/55] Format stuff yk --- .../java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java | 3 +-- src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java | 4 +--- src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index a326762..341245f 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -38,8 +38,7 @@ public class RandomPornCommand implements Command { } else { e.getTextChannel() - .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) - .queue(); + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index baa99b9..beebb7f 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -36,9 +36,7 @@ public class SpankCommand implements Command { .build()).queue(); } else { - e.getTextChannel() - .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) - .queue(); + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index 176a796..f89de4f 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -37,8 +37,7 @@ public class TransCommand implements Command { } else { e.getTextChannel() - .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()) - .queue(); + .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue(); } } From 16faa926ae2844cc8c75873eb6ae60058afed3bf Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:06:55 +0100 Subject: [PATCH 51/55] Rename missing stuff --- .../bbn/hadder/listener/RulesListener.java | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 53becb6..a4e0812 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -31,43 +31,43 @@ public class RulesListener extends ListenerAdapter { } @Override - public void onMessageReactionAdd(MessageReactionAddEvent event) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.getMessageId().equals(rethinkServer.getMessage_id()) && !event.getMember().getUser().isBot()) { - if (event.getReactionEmote().isEmote()) { - if (rethinkServer.getAccept_emote().equals(event.getReactionEmote().getId())) { - addRole(event); - } else if (rethinkServer.getDecline_emote().equals(event.getReactionEmote().getId())) { - event.getReaction().removeReaction(event.getUser()).queue(); - if (event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getMember().kick().reason("Declined the rules"); + public void onMessageReactionAdd(MessageReactionAddEvent e) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { + if (e.getReactionEmote().isEmote()) { + if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getId())) { + addRole(e); + } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getId())) { + e.getReaction().removeReaction(e.getUser()).queue(); + if (e.getGuild().getSelfMember().canInteract(e.getMember())) { + e.getMember().kick().reason("Declined the rules"); } } - } else if (event.getReactionEmote().isEmoji()) { - if (rethinkServer.getAccept_emote().equals(event.getReactionEmote().getEmoji())) { - addRole(event); - } else if (rethinkServer.getDecline_emote().equals(event.getReactionEmote().getEmoji())) { - event.getReaction().removeReaction(event.getUser()).queue(); - if (event.getGuild().getSelfMember().canInteract(event.getMember())) { - event.getMember().kick().reason("Declined the rules"); + } else if (e.getReactionEmote().isEmoji()) { + if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getEmoji())) { + addRole(e); + } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getEmoji())) { + e.getReaction().removeReaction(e.getUser()).queue(); + if (e.getGuild().getSelfMember().canInteract(e.getMember())) { + e.getMember().kick().reason("Declined the rules"); } } } } } - private void addRole(MessageReactionAddEvent event) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethinkServer.getRole_id()))) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); - } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); + private void addRole(MessageReactionAddEvent e) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRole_id()))) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); + } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); } @Override - public void onMessageReactionRemove(MessageReactionRemoveEvent event) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.getMessageId().equals(rethinkServer.getMessage_id()) && !event.getMember().getUser().isBot()) { - event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Withdrawal of the acceptance of the rules").queue(); + public void onMessageReactionRemove(MessageReactionRemoveEvent e) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Withdrawal of the acceptance of the rules").queue(); } } } From bd4fda3094c578073d00c089194a56927dddd813 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:12:33 +0100 Subject: [PATCH 52/55] Rename more missing stuff --- .../bbn/hadder/listener/CommandListener.java | 26 ++++++++--------- .../hadder/listener/InviteLinkListener.java | 28 +++++++++---------- .../bbn/hadder/listener/MentionListener.java | 28 +++++++++---------- .../listener/PrivateMessageListener.java | 26 ++++++++--------- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index 12cd584..aeb8615 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -43,28 +43,28 @@ public class CommandListener extends ListenerAdapter { } @Override - public void onMessageReceived(MessageReceivedEvent event) { - if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_WRITE)) { - if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { - RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", event.getAuthor().getId()), rethink); - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); + public void onMessageReceived(MessageReceivedEvent e) { + if (e.isFromType(ChannelType.TEXT) && !e.getAuthor().isBot()) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_WRITE)) { + if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) { + RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", e.getAuthor().getId()), rethink); + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); rethinkUser.push(); rethinkServer.push(); String[] prefixes = { rethinkUser.getPrefix(), rethinkServer.getPrefix(), - event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(), - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", - event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + e.getGuild().getSelfMember().getAsMention() + " ", e.getGuild().getSelfMember().getAsMention(), + e.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ", + e.getGuild().getSelfMember().getAsMention().replace("@", "@!") }; for (String prefix : prefixes) { - if (event.getMessage().getContentRaw().startsWith(prefix)) { - handler.handle(event, rethink, prefix, audioManager, rethinkUser, rethinkServer); + if (e.getMessage().getContentRaw().startsWith(prefix)) { + handler.handle(e, rethink, prefix, audioManager, rethinkUser, rethinkServer); return; } } } else { - event.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() .setTitle("No permission") .setDescription("I need the `MESSAGE EMBED LINKS` permission in order to work!") .setColor(Color.RED) @@ -73,7 +73,7 @@ public class CommandListener extends ListenerAdapter { .build()).queue(); } } else { - event.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() + e.getAuthor().openPrivateChannel().complete().sendMessage(new EmbedBuilder() .setTitle("No permission") .setDescription("I need the `MESSAGE WRITE` permission in order to work!") .setColor(Color.RED) diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 2274600..9e16a59 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -40,13 +40,13 @@ public class InviteLinkListener extends ListenerAdapter { } @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { - checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { - checkInvite(event.getMessage(), "discordapp.com/invite/"); + public void onMessageReceived(@Nonnull MessageReceivedEvent e) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (e.isFromType(ChannelType.TEXT)) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { + checkInvite(e.getMessage(), "discord.gg/"); + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { + checkInvite(e.getMessage(), "discordapp.com/invite/"); } } } @@ -68,13 +68,13 @@ public class InviteLinkListener extends ListenerAdapter { } @Override - public void onMessageUpdate(@Nonnull MessageUpdateEvent event) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - if (event.isFromType(ChannelType.TEXT)) { - if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { - checkInvite(event.getMessage(), "discord.gg/"); - } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { - checkInvite(event.getMessage(), "discordapp.com/invite/"); + public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + if (e.isFromType(ChannelType.TEXT)) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { + checkInvite(e.getMessage(), "discord.gg/"); + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { + checkInvite(e.getMessage(), "discordapp.com/invite/"); } } } diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index c399fe7..886ab51 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -36,24 +36,24 @@ public class MentionListener extends ListenerAdapter { } @Override - public void onMessageReceived(@Nonnull MessageReceivedEvent event) { - if (!event.getAuthor().isBot()) { - RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", event.getGuild().getId()), rethink); - RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", event.getAuthor().getId()), rethink); - if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention()) || - event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { - event.getChannel().sendMessage(new MessageEditor(rethinkUser, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO) + public void onMessageReceived(@Nonnull MessageReceivedEvent e) { + if (!e.getAuthor().isBot()) { + RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); + RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", e.getAuthor().getId()), rethink); + if (e.isFromType(ChannelType.TEXT) && (e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention()) || + e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) { + e.getChannel().sendMessage(new MessageEditor(rethinkUser, e.getAuthor()).getMessage(MessageEditor.MessageType.INFO) .setTitle("Hello I'm Hadder.") - .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl()) - .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false) - .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false) + .setAuthor(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl(), e.getJDA().getSelfUser().getAvatarUrl()) + .addField("Users", String.valueOf(e.getJDA().getUsers().size()), false) + .addField("Guilds", String.valueOf(e.getJDA().getGuilds().size()), false) .addField("Prefix (User)", rethinkUser.getPrefix(), false) .addField("Prefix (Guild)", rethinkServer.getPrefix(), false) .build()).queue(); - } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { - int member = new Random().nextInt(event.getGuild().getMembers().size() - 1); - if (member > 0 && member < event.getGuild().getMembers().size()) { - event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention() + " (Executed by: " + event.getAuthor().getAsTag() + ")").queue(); + } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) { + int member = new Random().nextInt(e.getGuild().getMembers().size() - 1); + if (member > 0 && member < e.getGuild().getMembers().size()) { + e.getChannel().sendMessage(e.getGuild().getMembers().get(member).getAsMention() + " (Executed by: " + e.getAuthor().getAsTag() + ")").queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index bfdcad1..fc258f9 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -36,26 +36,26 @@ public class PrivateMessageListener extends ListenerAdapter { this.rethink = rethink; } - public void onMessageReceived(MessageReceivedEvent event) { - if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { - PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); - PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); + public void onMessageReceived(MessageReceivedEvent e) { + if (e.isFromType(ChannelType.PRIVATE) && !e.getAuthor().getId().equals(e.getJDA().getSelfUser().getId())) { + PrivateChannel Skidder = e.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); + PrivateChannel Hax = e.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", "261083609148948488"), rethink); - Skidder.sendMessage(new MessageEditor(rethinkUser, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) - .setTitle("New DM by " + event.getAuthor().getAsTag()) - .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) - .setDescription(event.getMessage().getContentRaw()) + Skidder.sendMessage(new MessageEditor(rethinkUser, e.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) + .setTitle("New DM by " + e.getAuthor().getAsTag()) + .setAuthor(e.getAuthor().getName(), e.getAuthor().getAvatarUrl(), e.getAuthor().getAvatarUrl()) + .setDescription(e.getMessage().getContentRaw()) .setTimestamp(Instant.now()) .build()).queue(); - Hax.sendMessage(new MessageEditor(rethinkUser, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) - .setTitle("New DM by " + event.getAuthor().getAsTag()) - .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) - .setDescription(event.getMessage().getContentRaw()) + Hax.sendMessage(new MessageEditor(rethinkUser, e.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO) + .setTitle("New DM by " + e.getAuthor().getAsTag()) + .setAuthor(e.getAuthor().getName(), e.getAuthor().getAvatarUrl(), e.getAuthor().getAvatarUrl()) + .setDescription(e.getMessage().getContentRaw()) .setTimestamp(Instant.now()) .build()).queue(); - event.getChannel().sendMessage(new EmbedBuilder() + e.getChannel().sendMessage(new EmbedBuilder() .setTitle("No DM support") .setDescription("You have to execute your commands on a guild!") .setColor(Color.RED) From fe965a5cf781427d367ffba3d8438576edcb1ae6 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:34:50 +0100 Subject: [PATCH 53/55] :thinking: --- src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/nsfw/FingeringCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/nsfw/LickingCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java | 4 ++-- src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java | 4 ++-- .../java/com/bbn/hadder/commands/owner/BlacklistCommand.java | 2 -- .../com/bbn/hadder/commands/settings/LanguageCommand.java | 3 +-- .../java/com/bbn/hadder/utils/{Request.java => Http.java} | 2 +- 18 files changed, 32 insertions(+), 35 deletions(-) rename src/main/java/com/bbn/hadder/utils/{Request.java => Http.java} (98%) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java index 2bb4cf1..da0baa4 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java @@ -19,14 +19,14 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class AnalCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) .setImage(url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java index 501bd69..53ec6b3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class BDSMCommand implements Command { @@ -27,7 +27,7 @@ public class BDSMCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java index 0687fbc..d53de45 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class BlowjobCommand implements Command { @@ -27,7 +27,7 @@ public class BlowjobCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://nekos.life/api/v2/img/blowjob"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/blowjob"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java index 1fbad2b..50c43df 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class BoobsCommand implements Command { @@ -27,7 +27,7 @@ public class BoobsCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java index 26a0a08..95c291b 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class CumCommand implements Command { @@ -27,7 +27,7 @@ public class CumCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java index 2e6a3cb..729bfea 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class EroticCommand implements Command { @@ -27,7 +27,7 @@ public class EroticCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://nekos.life/api/v2/img/erok"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/erok"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java index 2c8ed8e..f304f29 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class FeetCommand implements Command { @@ -27,7 +27,7 @@ public class FeetCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java index 2244b6b..cf1d3c5 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class FingeringCommand implements Command { @@ -27,7 +27,7 @@ public class FingeringCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java index ae9363c..4bc70be 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class LickingCommand implements Command { @@ -27,7 +27,7 @@ public class LickingCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java index 66763b6..6b9f037 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class PornCommand implements Command { @@ -27,7 +27,7 @@ public class PornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java index 6189d24..b2896d3 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class PussyCommand implements Command { @@ -27,7 +27,7 @@ public class PussyCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://nekos.life/api/v2/img/pussy/"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/pussy/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java index 341245f..15a8be7 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class RandomPornCommand implements Command { @@ -27,7 +27,7 @@ public class RandomPornCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/"); e.getTextChannel() .sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java index 3ba58ef..7ad6e49 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class SoloCommand implements Command { @@ -27,7 +27,7 @@ public class SoloCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java index beebb7f..8f6535a 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class SpankCommand implements Command { @@ -27,7 +27,7 @@ public class SpankCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); + String url = Http.getNSFW("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java index f89de4f..e72db47 100644 --- a/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java +++ b/src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java @@ -19,7 +19,7 @@ package com.bbn.hadder.commands.nsfw; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; -import com.bbn.hadder.utils.Request; +import com.bbn.hadder.utils.Http; public class TransCommand implements Command { @@ -27,7 +27,7 @@ public class TransCommand implements Command { public void executed(String[] args, CommandEvent e) { if (e.getTextChannel().isNSFW()) { - String url = Request.getNSFW("https://nekos.life/api/v2/img/trap/"); + String url = Http.getNSFW("https://nekos.life/api/v2/img/trap/"); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setAuthor(e.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url) diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java index edbabd6..5bd8f3e 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java @@ -40,7 +40,6 @@ public class BlacklistCommand implements Command { switch (args[0].toLowerCase()) { case "add": if (args.length == 3) { - Member member = e.getMessage().getMentionedMembers().get(0); String blacklisted = e.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); @@ -61,7 +60,6 @@ public class BlacklistCommand implements Command { case "remove": if (args.length == 3) { - Member member = e.getMessage().getMentionedMembers().get(0); String blacklisted = e.getRethinkUser().getBlacklisted(); List commands = new ArrayList<>(); if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(","))); diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index a97f3e2..87c5b56 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -60,8 +60,7 @@ public class LanguageCommand implements Command { e.getMessageEditor() .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title", "", "commands.settings.language.success.description", language) - .build()) - .queue(); + .build()).queue(); e.getRethinkUser().push(); } diff --git a/src/main/java/com/bbn/hadder/utils/Request.java b/src/main/java/com/bbn/hadder/utils/Http.java similarity index 98% rename from src/main/java/com/bbn/hadder/utils/Request.java rename to src/main/java/com/bbn/hadder/utils/Http.java index acb2c3f..3caa009 100644 --- a/src/main/java/com/bbn/hadder/utils/Request.java +++ b/src/main/java/com/bbn/hadder/utils/Http.java @@ -22,7 +22,7 @@ import org.json.JSONObject; import java.io.IOException; -public class Request { +public class Http { public static String getNSFW(String url) { From 7afba16cdebcc7708adbcecc89796515aefe6ec1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:37:45 +0100 Subject: [PATCH 54/55] Add default: --- .../commands/settings/LanguageCommand.java | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java index 87c5b56..9cece7a 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java @@ -19,6 +19,7 @@ package com.bbn.hadder.commands.settings; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; public class LanguageCommand implements Command { @@ -26,26 +27,32 @@ public class LanguageCommand implements Command { public void executed(String[] args, CommandEvent e) { if (args.length == 1) { switch (args[0].toLowerCase()) { - case "de": - setLanguage("de", "German", e); - break; - case "en": - setLanguage("en", "English", e); - break; - case "es": - setLanguage("es", "Spanish", e); - break; - case "fr": - setLanguage("fr", "French", e); - break; - case "ru": - setLanguage("ru", "Russian", e); - break; - case "tr": - setLanguage("tr", "Turkish", e); - break; - case "zh": - setLanguage("zh", "Chinese", e); + case "de": + setLanguage("de", "German", e); + break; + case "en": + setLanguage("en", "English", e); + break; + case "es": + setLanguage("es", "Spanish", e); + break; + case "fr": + setLanguage("fr", "French", e); + break; + case "ru": + setLanguage("ru", "Russian", e); + break; + case "tr": + setLanguage("tr", "Turkish", e); + break; + case "zh": + setLanguage("zh", "Chinese", e); + break; + default: + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "List", + "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`") + .build()).queue(); break; } } else { From ee2f8a081123c5d02b0fca2fef3213733c02eb49 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 17:44:24 +0100 Subject: [PATCH 55/55] Codacy --- .../java/com/bbn/hadder/RethinkServer.java | 50 +++++++++---------- src/main/java/com/bbn/hadder/RethinkUser.java | 8 +-- .../com/bbn/hadder/audio/TrackManager.java | 2 +- .../commands/moderation/EditRulesCommand.java | 6 +-- .../moderation/InviteDetectCommand.java | 8 +-- .../commands/moderation/StarboardCommand.java | 2 +- .../hadder/commands/music/RecordCommand.java | 12 +---- .../hadder/listener/InviteLinkListener.java | 8 +-- .../bbn/hadder/listener/RulesListener.java | 20 ++++---- .../hadder/listener/StarboardListener.java | 4 +- 10 files changed, 56 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index e73a9d3..36af37e 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -24,15 +24,15 @@ public class RethinkServer { private Rethink rethink; - String accept_emote = ""; - String decline_emote = ""; - String id; - boolean invite_detect = false; - String message_id = ""; - String neededstars = "3"; - String prefix = "h."; - String role_id = ""; - String starboard = ""; + private String accept_emote = ""; + private String decline_emote = ""; + private String id; + private boolean invite_detect = false; + private String message_id = ""; + private String neededstars = "3"; + private String prefix = "h."; + private String role_id = ""; + private String starboard = ""; public RethinkServer(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { @@ -48,19 +48,19 @@ public class RethinkServer { this.rethink = rethink; } - public String getAccept_emote() { + public String getAcceptEmote() { return accept_emote; } - public void setAccept_emote(String accept_emote) { + public void setAcceptEmote(String accept_emote) { this.accept_emote = accept_emote; } - public String getDecline_emote() { + public String getDeclineEmote() { return decline_emote; } - public void setDecline_emote(String decline_emote) { + public void setDeclineEmote(String decline_emote) { this.decline_emote = decline_emote; } @@ -68,27 +68,27 @@ public class RethinkServer { return id; } - public boolean isInvite_detect() { + public boolean isInviteDetect() { return invite_detect; } - public void setInvite_detect(boolean invite_detect) { + public void setInviteDetect(boolean invite_detect) { this.invite_detect = invite_detect; } - public String getMessage_id() { + public String getMessageID() { return message_id; } - public void setMessage_id(String message_id) { + public void setMessageID(String message_id) { this.message_id = message_id; } - public String getNeededstars() { + public String getNeededStars() { return neededstars; } - public void setNeededstars(String neededstars) { + public void setNeededStars(String neededstars) { this.neededstars = neededstars; } @@ -100,11 +100,11 @@ public class RethinkServer { this.prefix = prefix; } - public String getRole_id() { + public String getRoleID() { return role_id; } - public void setRole_id(String role_id) { + public void setRoleID(String role_id) { this.role_id = role_id; } @@ -117,10 +117,10 @@ public class RethinkServer { } public void updateRules(String message_id, String role_id, String accept_emote, String decline_emote) { - this.setMessage_id(message_id); - this.setRole_id(role_id); - this.setAccept_emote(accept_emote); - this.setDecline_emote(decline_emote); + this.setMessageID(message_id); + this.setRoleID(role_id); + this.setAcceptEmote(accept_emote); + this.setDeclineEmote(decline_emote); } public void push() { diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index 26376f5..94a7189 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -24,10 +24,10 @@ public class RethinkUser { private Rethink rethink; - String id; - String prefix = "h."; - String language = "en"; - String blacklisted = "none"; + private String id; + private String prefix = "h."; + private String language = "en"; + private String blacklisted = "none"; public RethinkUser(JSONObject object, Rethink rethink) { for (Field field : this.getClass().getDeclaredFields()) { diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index b1c9946..bb4141f 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -32,7 +32,7 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final AudioManager manager; private final Queue queue; - AudioTrack lastTrack; + private AudioTrack lastTrack; private boolean loop = false; public TrackManager(AudioPlayer player, AudioManager manager) { diff --git a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java index f0f4f6d..7b6b70b 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/EditRulesCommand.java @@ -28,7 +28,7 @@ public class EditRulesCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { - if (e.getRethinkServer().getMessage_id().length() == 18) { + if (e.getRethinkServer().getMessageID().length() == 18) { e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.message.title", "commands.moderation.editrules.message.description").build()).queue(); @@ -74,7 +74,7 @@ public class EditRulesCommand implements Command { public void checkChannel(CommandEvent e, String rules, TextChannel channel) { try { - channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).queue(); + channel.retrieveMessageById(e.getRethinkServer().getMessageID()).queue(); setRules(e, rules, channel); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.editrules.success.title", @@ -87,7 +87,7 @@ public class EditRulesCommand implements Command { } public void setRules(CommandEvent e, String rules, TextChannel channel) { - channel.retrieveMessageById(e.getRethinkServer().getMessage_id()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) + channel.retrieveMessageById(e.getRethinkServer().getMessageID()).complete().editMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO) .setTitle("Rules") .setDescription(rules) .build()).queue(); diff --git a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java index 6df2eef..faad4da 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/InviteDetectCommand.java @@ -31,8 +31,8 @@ public class InviteDetectCommand implements Command { String opinion = args[0].toLowerCase(); switch (opinion) { case "on": - if (!e.getRethinkServer().isInvite_detect()) { - e.getRethinkServer().setInvite_detect(true); + if (!e.getRethinkServer().isInviteDetect()) { + e.getRethinkServer().setInviteDetect(true); e.getTextChannel().sendMessage( e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, @@ -50,8 +50,8 @@ public class InviteDetectCommand implements Command { break; case "off": - if (e.getRethinkServer().isInvite_detect()) { - e.getRethinkServer().setInvite_detect(false); + if (e.getRethinkServer().isInviteDetect()) { + e.getRethinkServer().setInviteDetect(false); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage( MessageEditor.MessageType.INFO, "commands.moderation.invitedetect.deactivate.success.title", diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java index 0871a17..2c497e3 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java @@ -45,7 +45,7 @@ public class StarboardCommand implements Command { } if (args.length==2) { - e.getRethinkServer().setNeededstars(args[1]); + e.getRethinkServer().setNeededStars(args[1]); } e.getRethinkServer().push(); diff --git a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java index 875cf53..48339ed 100644 --- a/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/RecordCommand.java @@ -10,31 +10,23 @@ import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import net.dv8tion.jda.api.audio.AudioReceiveHandler; import net.dv8tion.jda.api.audio.AudioSendHandler; -import net.dv8tion.jda.api.audio.CombinedAudio; import net.dv8tion.jda.api.audio.UserAudio; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.managers.AudioManager; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.sound.sampled.*; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.Queue; -import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; @Perms(Perm.BOT_OWNER) public class RecordCommand implements Command { - private final HashMap> queue = new HashMap>(); + private final HashMap> queue = new HashMap<>(); @Override public void executed(String[] args, CommandEvent event) { @@ -49,7 +41,7 @@ public class RecordCommand implements Command { for (Map.Entry> key : queue.entrySet()) { File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav"); - + } } } diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java index 9e16a59..88aa3ee 100644 --- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java +++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java @@ -43,9 +43,9 @@ public class InviteLinkListener extends ListenerAdapter { public void onMessageReceived(@Nonnull MessageReceivedEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.isFromType(ChannelType.TEXT)) { - if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect())) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && (!e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect())) { checkInvite(e.getMessage(), "discordapp.com/invite/"); } } @@ -71,9 +71,9 @@ public class InviteLinkListener extends ListenerAdapter { public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); if (e.isFromType(ChannelType.TEXT)) { - if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { + if (e.getMessage().getContentRaw().contains("discord.gg/") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect()) { checkInvite(e.getMessage(), "discord.gg/"); - } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInvite_detect()) { + } else if (e.getMessage().getContentRaw().contains("discordapp.com/invite") && !e.getMember().hasPermission(Permission.ADMINISTRATOR) && rethinkServer.isInviteDetect()) { checkInvite(e.getMessage(), "discordapp.com/invite/"); } } diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index a4e0812..8ee5fc4 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -33,20 +33,20 @@ public class RulesListener extends ListenerAdapter { @Override public void onMessageReactionAdd(MessageReactionAddEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { + if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { if (e.getReactionEmote().isEmote()) { - if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getId())) { + if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getId())) { addRole(e); - } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getId())) { + } else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getId())) { e.getReaction().removeReaction(e.getUser()).queue(); if (e.getGuild().getSelfMember().canInteract(e.getMember())) { e.getMember().kick().reason("Declined the rules"); } } } else if (e.getReactionEmote().isEmoji()) { - if (rethinkServer.getAccept_emote().equals(e.getReactionEmote().getEmoji())) { + if (rethinkServer.getAcceptEmote().equals(e.getReactionEmote().getEmoji())) { addRole(e); - } else if (rethinkServer.getDecline_emote().equals(e.getReactionEmote().getEmoji())) { + } else if (rethinkServer.getDeclineEmote().equals(e.getReactionEmote().getEmoji())) { e.getReaction().removeReaction(e.getUser()).queue(); if (e.getGuild().getSelfMember().canInteract(e.getMember())) { e.getMember().kick().reason("Declined the rules"); @@ -58,16 +58,16 @@ public class RulesListener extends ListenerAdapter { private void addRole(MessageReactionAddEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRole_id()))) { - e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); - } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Accepted rules").queue(); + if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); + } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue(); } @Override public void onMessageReactionRemove(MessageReactionRemoveEvent e) { RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink); - if (e.getMessageId().equals(rethinkServer.getMessage_id()) && !e.getUser().isBot()) { - e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRole_id())).reason("Withdrawal of the acceptance of the rules").queue(); + if (e.getMessageId().equals(rethinkServer.getMessageID()) && !e.getUser().isBot()) { + e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Withdrawal of the acceptance of the rules").queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index bb8cdcc..ba66f81 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -60,7 +60,7 @@ public class StarboardListener extends ListenerAdapter { } } - if (Integer.parseInt(rethinkServer.getNeededstars()) <= stars) { + if (Integer.parseInt(rethinkServer.getNeededStars()) <= stars) { e.getGuild().getTextChannelById(rethinkServer.getStarboard()) .sendMessage(new MessageBuilder() .setContent("⭐ 1" + " " + e.getTextChannel().getAsMention()) @@ -94,7 +94,7 @@ public class StarboardListener extends ListenerAdapter { .retrieveMessageById(rethink.getStarboardMessage(e.getMessageId())).queue( msg2 -> { - if (Integer.parseInt(rethinkServer.getNeededstars()) <= finalStars) { + if (Integer.parseInt(rethinkServer.getNeededStars()) <= finalStars) { msg2.editMessage(new MessageBuilder() .setContent("⭐ " + finalStars + " " + e.getTextChannel().getAsMention()) .setEmbed(