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(); } } }