From e3a5344fde262a1bcd1d05f083d9e0a5f4c5b701 Mon Sep 17 00:00:00 2001 From: Hax Date: Sat, 16 Nov 2019 22:46:41 +0100 Subject: [PATCH 1/4] Auto stash before merge of "hax-dev" and "origin/master" --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../commands/moderation/AddRoleCommand.java | 67 +++++++++++++++++++ .../hadder/commands/owner/TestCommand.java | 3 + 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 27df501..636c5c4 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -55,7 +55,8 @@ public class Hadder { new EqualsCommand(), new InviteCommand(), new NickCommand(), - new GuildPrefixCommand()), config); + new GuildPrefixCommand(), + new AddRoleCommand()), config); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java new file mode 100644 index 0000000..5e6da5d --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java @@ -0,0 +1,67 @@ +package com.bbn.hadder.commands.moderation; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; + +public class AddRoleCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { + if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { + for (Member member : event.getMessage().getMentionedMembers()) { + if (event.getGuild().getSelfMember().canInteract(member)) { + if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { + event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) + .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); + } + } + } + event.getChannel().sendMessage( + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, + new EmbedBuilder().setTitle("Successfully added all " + + event.getMessage().getMentionedMembers().size() + + " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); + } else if (event.getMessage().getMentionedRoles().size() > 1) { + for (Role role : event.getMessage().getMentionedRoles()) { + if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { + if (event.getGuild().getSelfMember().canInteract(role)) { + int highestrole = 0; + for (Role testrole : event.getGuild().getSelfMember().getRoles()) { + if (testrole.getPosition()>highestrole) { + highestrole=testrole.getPosition(); + } + } + for (Member member : event.getGuild().getMembers()) { + if (member.getRoles().contains(role)) { + event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) + .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); + } + } + } + } + } + } + } + } + + @Override + public String[] labels() { + return new String[]{"addrole", "addroles"}; + } + + @Override + public String description() { + return null; + } + + @Override + public String usage() { + return null; + } +} 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 6c21042..be8d3c5 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -2,6 +2,9 @@ package com.bbn.hadder.commands.owner; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import net.dv8tion.jda.api.entities.Activity; + +import java.util.Arrays; /* * @author Skidder / GregTCLTK -- 2.45.3 From a5907ef1399702a5c6568b4b1dad1011b39efa7d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 17 Nov 2019 00:11:01 +0100 Subject: [PATCH 2/4] AddRole to Role --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- .../commands/moderation/AddRoleCommand.java | 67 ---------------- .../commands/moderation/RoleCommand.java | 77 +++++++++++++++++++ 3 files changed, 78 insertions(+), 68 deletions(-) delete mode 100644 src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java create mode 100644 src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 636c5c4..e17eba6 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -56,7 +56,7 @@ public class Hadder { new InviteCommand(), new NickCommand(), new GuildPrefixCommand(), - new AddRoleCommand()), config); + new RoleCommand()), config); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java deleted file mode 100644 index 5e6da5d..0000000 --- a/src/main/java/com/bbn/hadder/commands/moderation/AddRoleCommand.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.bbn.hadder.commands.moderation; - -import com.bbn.hadder.commands.Command; -import com.bbn.hadder.commands.CommandEvent; -import com.bbn.hadder.utils.MessageEditor; -import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.Permission; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.Role; - -public class AddRoleCommand implements Command { - - @Override - public void executed(String[] args, CommandEvent event) { - if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { - if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { - for (Member member : event.getMessage().getMentionedMembers()) { - if (event.getGuild().getSelfMember().canInteract(member)) { - if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { - event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) - .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); - } - } - } - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, - new EmbedBuilder().setTitle("Successfully added all " + - event.getMessage().getMentionedMembers().size() + - " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); - } else if (event.getMessage().getMentionedRoles().size() > 1) { - for (Role role : event.getMessage().getMentionedRoles()) { - if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { - if (event.getGuild().getSelfMember().canInteract(role)) { - int highestrole = 0; - for (Role testrole : event.getGuild().getSelfMember().getRoles()) { - if (testrole.getPosition()>highestrole) { - highestrole=testrole.getPosition(); - } - } - for (Member member : event.getGuild().getMembers()) { - if (member.getRoles().contains(role)) { - event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) - .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); - } - } - } - } - } - } - } - } - - @Override - public String[] labels() { - return new String[]{"addrole", "addroles"}; - } - - @Override - public String description() { - return null; - } - - @Override - public String usage() { - return null; - } -} diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java new file mode 100644 index 0000000..75f8f99 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -0,0 +1,77 @@ +package com.bbn.hadder.commands.moderation; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.Permission; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Role; + +public class RoleCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + switch (args[0].toLowerCase()) { + case "add": + if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { + if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { + for (Member member : event.getMessage().getMentionedMembers()) { + if (event.getGuild().getSelfMember().canInteract(member)) { + if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { + event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) + .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); + } + } + } + event.getChannel().sendMessage( + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, + new EmbedBuilder().setTitle("Successfully added all " + + event.getMessage().getMentionedMembers().size() + + " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); + } else if (event.getMessage().getMentionedRoles().size() > 1) { + for (Role role : event.getMessage().getMentionedRoles()) { + if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { + if (event.getGuild().getSelfMember().canInteract(role)) { + int highestrole = 0; + for (Role testrole : event.getGuild().getSelfMember().getRoles()) { + if (testrole.getPosition()>highestrole) { + highestrole=testrole.getPosition(); + } + } + for (Member member : event.getGuild().getMembers()) { + if (member.getRoles().contains(role)) { + event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) + .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); + } + } + } + } + } + } + } + + break; + + case "remove": + + + break; + } + } + + @Override + public String[] labels() { + return new String[]{"addrole", "addroles"}; + } + + @Override + public String description() { + return null; + } + + @Override + public String usage() { + return null; + } +} -- 2.45.3 From 7cf1e8769f403df6d2b61ce51fee419ab6ef6cff Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 17 Nov 2019 00:36:56 +0100 Subject: [PATCH 3/4] Check perms --- .../commands/moderation/RoleCommand.java | 87 +++++++++++-------- 1 file changed, 49 insertions(+), 38 deletions(-) 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 75f8f99..aeb0f42 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -12,57 +12,68 @@ public class RoleCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - switch (args[0].toLowerCase()) { - case "add": - if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { - if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { - for (Member member : event.getMessage().getMentionedMembers()) { - if (event.getGuild().getSelfMember().canInteract(member)) { - if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { - event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) - .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); - } - } - } - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, - new EmbedBuilder().setTitle("Successfully added all " + - event.getMessage().getMentionedMembers().size() + - " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); - } else if (event.getMessage().getMentionedRoles().size() > 1) { - for (Role role : event.getMessage().getMentionedRoles()) { - if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { - if (event.getGuild().getSelfMember().canInteract(role)) { - int highestrole = 0; - for (Role testrole : event.getGuild().getSelfMember().getRoles()) { - if (testrole.getPosition()>highestrole) { - highestrole=testrole.getPosition(); - } - } - for (Member member : event.getGuild().getMembers()) { - if (member.getRoles().contains(role)) { + if (args.length > 0) { + if (event.getMember().hasPermission(Permission.MANAGE_ROLES)) { + if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { + switch (args[0].toLowerCase()) { + case "add": + if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { + for (Member member : event.getMessage().getMentionedMembers()) { + if (event.getGuild().getSelfMember().canInteract(member)) { + if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); } } } + event.getChannel().sendMessage( + new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, + new EmbedBuilder().setTitle("Successfully added all " + + event.getMessage().getMentionedMembers().size() + + " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); + } else if (event.getMessage().getMentionedRoles().size() > 1) { + for (Role role : event.getMessage().getMentionedRoles()) { + if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { + if (event.getGuild().getSelfMember().canInteract(role)) { + int highestrole = 0; + for (Role testrole : event.getGuild().getSelfMember().getRoles()) { + if (testrole.getPosition() > highestrole) { + highestrole = testrole.getPosition(); + } + } + for (Member member : event.getGuild().getMembers()) { + if (member.getRoles().contains(role)) { + event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) + .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); + } + } + } + } + } } - } + break; + + case "remove": + + + break; } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); } - - break; - - case "remove": - - - break; + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + } + } else { + event.getTextChannel().sendMessage("Missing args").queue(); } } @Override public String[] labels() { - return new String[]{"addrole", "addroles"}; + return new String[]{"role", "roles"}; } @Override -- 2.45.3 From c95b8d6c543e89bb9cbb32dd55514ee4c2c0e54c Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 17 Nov 2019 01:32:33 +0100 Subject: [PATCH 4/4] Very nice improvements --- .../bbn/hadder/commands/fun/GifCommand.java | 8 +-- .../hadder/commands/general/HelpCommand.java | 12 ++-- .../hadder/commands/general/PingCommand.java | 6 +- .../hadder/commands/misc/EqualsCommand.java | 8 +-- .../hadder/commands/misc/GitHubCommand.java | 12 ++-- .../hadder/commands/misc/InviteCommand.java | 4 +- .../commands/misc/ScreenshareCommand.java | 20 +++---- .../commands/moderation/BanCommand.java | 22 +++---- .../commands/moderation/ClearCommand.java | 14 ++--- .../moderation/GuildPrefixCommand.java | 8 +-- .../commands/moderation/KickCommand.java | 20 +++---- .../commands/moderation/NickCommand.java | 22 +++---- .../commands/moderation/RoleCommand.java | 57 +++++++------------ .../hadder/commands/owner/RebootCommand.java | 2 +- .../commands/owner/ShutdownCommand.java | 4 +- .../hadder/commands/owner/TestCommand.java | 2 +- .../commands/settings/PrefixCommand.java | 6 +- .../bbn/hadder/listener/GuildListener.java | 4 +- .../bbn/hadder/listener/MentionListener.java | 2 +- .../listener/PrivateMessageListener.java | 4 +- .../java/com/bbn/hadder/utils/BotList.java | 6 +- .../com/bbn/hadder/utils/MessageEditor.java | 4 +- 22 files changed, 116 insertions(+), 131 deletions(-) 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 ae57750..dbb3ad3 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -40,11 +40,11 @@ public class GifCommand implements Command { event.getTextChannel().sendMessage(url).queue(); } catch (Exception e) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, builder).setTitle("Error").setDescription("Please try again with another term.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, builder).setTitle("Error").setDescription("Please try again with another term.").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to write at least one search term!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to write at least one search term!").build()).queue(); } } @@ -55,11 +55,11 @@ public class GifCommand implements Command { @Override public String description() { - return "Displays a gif"; + return "Look for a GIF on Giphy"; } @Override public String usage() { - return ""; + return ""; } } 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 848c927..6b1e4e6 100644 --- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java @@ -35,11 +35,11 @@ public class HelpCommand implements Command { sb.append("`").append(cmd.labels()[0]).append("`"); if (i < entry.getValue().size() - 1) sb.append(", "); } - String[] packagesplit = entry.getKey().split("\\."); - eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false); + String[] ps = entry.getKey().split("\\."); + eb.addField(ps[ps.length - 1], sb.toString(), false); } } - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, eb); event.getChannel().sendMessage(eb.build()).queue(); } else { for (Command cmd : event.getCommandHandler().getCommandList()) { @@ -50,7 +50,7 @@ public class HelpCommand implements Command { String name = cmd.labels()[0]; eb.setDescription(cmd.description()).setTitle(name.replaceFirst(String.valueOf(name.charAt(0)), String.valueOf(name.charAt(0)).toUpperCase())); eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false); - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, eb); + new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, eb); event.getChannel().sendMessage(eb.build()).queue(); } } @@ -69,11 +69,11 @@ public class HelpCommand implements Command { @Override public String description() { - return "Shows every Command or explains a Command"; + return "Shows each command or explains its usage"; } @Override public String usage() { - return "[Commandname]"; + return "[CommandName]"; } } 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 5db17c0..29c3b3b 100644 --- a/src/main/java/com/bbn/hadder/commands/general/PingCommand.java +++ b/src/main/java/com/bbn/hadder/commands/general/PingCommand.java @@ -14,9 +14,7 @@ public class PingCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getJDA().getRestPing().queue(ping -> { - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue(); - }); + event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue()); } @Override @@ -26,7 +24,7 @@ public class PingCommand implements Command { @Override public String description() { - return "Shows the ping to the discord api"; + return "Shows the ping to the Discord API"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java index ec1a33c..4ea64b1 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/EqualsCommand.java @@ -13,7 +13,7 @@ public class EqualsCommand implements Command { event.getChannel().sendMessage( new MessageEditor() .setDefaultSettings( - MessageEditor.Messagetype.INFO, + MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Please send me the first String") ).build() @@ -23,7 +23,7 @@ public class EqualsCommand implements Command { event.getChannel().sendMessage( new MessageEditor() .setDefaultSettings( - MessageEditor.Messagetype.INFO, + MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Please send me the second String") ).build() @@ -31,7 +31,7 @@ public class EqualsCommand implements Command { new EventWaiter().newOnMessageEventWaiter(msgevent2 -> { String secondString = msgevent2.getMessage().getContentRaw(); event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() + new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle((firstString.equals(secondString)) ? "Yes! The first string equals the second string!" : "Well yes, but actually No. This isn't the same.") .addField("First String", firstString, false) .addField("Second String", secondString, false) @@ -49,7 +49,7 @@ public class EqualsCommand implements Command { @Override public String description() { - return "Check's if two string are equal to each other"; + return "Check if two strings are the same"; } @Override 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 5bafb91..2cc681b 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -23,7 +23,7 @@ public class GitHubCommand implements Command { if (args.length > 0) { if (args[0].equals("link")) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Link your GitHub Account").setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Link your GitHub Account").setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue(); } else { Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build(); try { @@ -47,7 +47,7 @@ public class GitHubCommand implements Command { if (!json.getString("blog").equals("")) website = json.getString("blog"); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder) .setAuthor("Information about " + 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("User bio", bio, false) @@ -61,10 +61,10 @@ public class GitHubCommand implements Command { } catch (IOException | NullPointerException e) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, builder).setDescription("The GitHub API might be down at the moment!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, builder).setDescription("The GitHub API might be down at the moment!").build()).queue(); } catch (JSONException e) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("This user does not exist!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("This user does not exist!").build()).queue(); } } } else { @@ -74,12 +74,12 @@ public class GitHubCommand implements Command { @Override public String[] labels() { - return new String[]{"GitHub"}; + return new String[]{"github"}; } @Override public String description() { - return "Shows info of an user"; + return "Displays information about a GitHub user profile"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java index 3295f25..6357d0e 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/InviteCommand.java @@ -15,7 +15,7 @@ public class InviteCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Invite me!").setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id=" + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)").build()).queue(); } @Override @@ -25,7 +25,7 @@ public class InviteCommand implements Command { @Override public String description() { - return "Hadder Bot Invite"; + return "Shows the invitation to invite Hadder to your server"; } @Override 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 80ed92e..64de8dd 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java @@ -17,13 +17,13 @@ public class ScreenshareCommand implements Command { for (VoiceChannel vc : event.getGuild().getVoiceChannels()) { try { if (vc.getIdLong() == Long.parseLong(args[0])) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Here's your Url to share your Screen") .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/")).build()).queue(); return; } } catch (NumberFormatException e) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder() .setTitle("Wait, that's illegal") .setDescription("This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.")).build()).queue(); return; @@ -39,31 +39,31 @@ public class ScreenshareCommand implements Command { VoiceChannel voiceChannel = vcs.get(i); eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false); } - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, eb).build()).queue(); + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, eb).build()).queue(); new EventWaiter().newOnMessageEventWaiter(msgevent -> { try { int i = Integer.parseInt(msgevent.getMessage().getContentRaw()); if (vcs.size() > i) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Here's your Url to share your Screen") .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/")).build()).queue(); } else { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder() .setTitle("You specified a wrong number!")).build()).queue(); } } catch (NumberFormatException e) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder() .setTitle("Wait, that's illegal") .setDescription("This isn't a Number.")).build()).queue(); } }, event.getJDA(), event.getAuthor()); } else if (vcs.size()==0) { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR, new EmbedBuilder() .setTitle("Hol' up") .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.")).build()).queue(); } else { - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, new EmbedBuilder() .setTitle("Here's your Url to share your Screen") .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/")).build()).queue(); } @@ -78,11 +78,11 @@ public class ScreenshareCommand implements Command { @Override public String description() { - return "Give you a link with the screenshare url"; + return "Shows you the link to share your screen"; } @Override public String usage() { - return ""; + return ""; } } 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 19d7b94..d85b936 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java @@ -23,22 +23,22 @@ public class BanCommand implements Command { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully banned ✅").setDescription("I successfully baned " + victim.getUser().getName() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully banned ✅").setDescription("I successfully baned " + victim.getUser().getName() + ".").build()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not ban myself").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("I can not ban myself").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setTitle("Not possible").setDescription("You can't ban yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setTitle("Not possible").setDescription("You can't ban yourself.").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); @@ -48,23 +48,23 @@ public class BanCommand implements Command { event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not ban myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("I can not ban myself!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't ban yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You can't ban yourself.").build()).queue(); } } EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully banned ✅").setDescription("I successfully banned " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully banned ✅").setDescription("I successfully banned " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } @@ -75,7 +75,7 @@ public class BanCommand implements Command { @Override public String description() { - return "Bans an user"; + return "Bans one ore more user from the server"; } @Override 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 b327476..968830d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java @@ -26,7 +26,7 @@ public class ClearCommand implements Command { int nbToDelete = Integer.parseInt(args[0]); if(nbToDelete < 1 || nbToDelete > 200) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to choose a number between 1 and 200!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to choose a number between 1 and 200!").build()).queue(); return; } List history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete(); @@ -34,22 +34,22 @@ public class ClearCommand implements Command { msgToDelete.addAll(history); event.getTextChannel().deleteMessages(msgToDelete).queue(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue(); } catch (NumberFormatException e) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to specify a number!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to specify a number!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to specify a number!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to specify a number!").build()).queue(); } } @@ -60,7 +60,7 @@ public class ClearCommand implements Command { @Override public String description() { - return "Clears messages"; + return "Deletes the specified number of messages"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java index 2c41a40..be03e01 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/GuildPrefixCommand.java @@ -18,18 +18,18 @@ public class GuildPrefixCommand implements Command { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } 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 07f538c..0b7a67d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java @@ -24,22 +24,22 @@ public class KickCommand implements Command { if (event.getGuild().getSelfMember().canInteract(victim)) { event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + victim.getUser().getName() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + victim.getUser().getName() + ".").build()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else if (event.getMessage().getMentionedMembers().size() > 1) { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); @@ -49,19 +49,19 @@ public class KickCommand implements Command { event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("I can not kick myself!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You can't kick yourself.").build()).queue(); } } EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully kicked ✅").setDescription("I successfully kicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } } @@ -73,7 +73,7 @@ public class KickCommand implements Command { @Override public String description() { - return "Kicks an user"; + return "Kicks one or more user from the server"; } @Override 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 1a7319b..f1216ff 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -24,34 +24,34 @@ public class NickCommand implements Command { 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(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) { event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setTitle("Missing arguments").setDescription("You have to specify a new nickname for the user(s).").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).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(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").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(); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully changed my nickname.").build()).queue(); } } } else if (event.getMessage().getMentionedMembers().size() == 0) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to mention at least one user!").build()).queue(); } else { for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) { Member member = event.getMessage().getMentionedMembers().get(i); @@ -62,15 +62,15 @@ public class NickCommand implements Command { } } EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().size() + " Members!").build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } @@ -81,7 +81,7 @@ public class NickCommand implements Command { @Override public String description() { - return "Rename a user"; + return "Rename a one or more user"; } @Override 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 aeb0f42..506da00 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java @@ -17,54 +17,41 @@ public class RoleCommand implements Command { if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) { switch (args[0].toLowerCase()) { case "add": - if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() == 1) { + if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) { for (Member member : event.getMessage().getMentionedMembers()) { - if (event.getGuild().getSelfMember().canInteract(member)) { - if (!member.getRoles().contains(event.getMessage().getMentionedRoles().get(0))) { - event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) - .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); - } - } - } - event.getChannel().sendMessage( - new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, - new EmbedBuilder().setTitle("Successfully added all " + - event.getMessage().getMentionedMembers().size() + - " Members the " + event.getMessage().getMentionedRoles().get(0).getName() + " Role")).build()).queue(); - } else if (event.getMessage().getMentionedRoles().size() > 1) { - for (Role role : event.getMessage().getMentionedRoles()) { - if (role == event.getMessage().getMentionedRoles().get(event.getMessage().getMentionedRoles().size() - 1)) { - if (event.getGuild().getSelfMember().canInteract(role)) { - int highestrole = 0; - for (Role testrole : event.getGuild().getSelfMember().getRoles()) { - if (testrole.getPosition() > highestrole) { - highestrole = testrole.getPosition(); - } - } - for (Member member : event.getGuild().getMembers()) { - if (member.getRoles().contains(role)) { - event.getGuild().addRoleToMember(member, event.getMessage().getMentionedRoles().get(0)) - .reason("Role Command executed by " + event.getAuthor().getAsTag()).queue(); - } - } + 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(); + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); + } + } else { + EmbedBuilder builder = new EmbedBuilder(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } } + EmbedBuilder builder = new EmbedBuilder(); + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder) + .setTitle("✅ Successfully added role(s) ✅") + .setDescription("I successfully added " + event.getMessage().getMentionedRoles().size() + " roles to " + event.getMessage().getMentionedMembers().size() + " members.") + .build()).queue(); } break; case "remove": - - + event.getTextChannel().sendMessage("SOON").queue(); break; } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION, builder).build()).queue(); } } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } else { event.getTextChannel().sendMessage("Missing args").queue(); @@ -78,11 +65,11 @@ public class RoleCommand implements Command { @Override public String description() { - return null; + return "Adds and removes roles from one or more user"; } @Override public String usage() { - return null; + return "<@role> <@user>"; } } 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 b058ffa..fceaa38 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java @@ -19,7 +19,7 @@ public class RebootCommand implements Command { } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } 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 2583570..14c161b 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java @@ -14,13 +14,13 @@ public class ShutdownCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Shutdown").build()).queue(); event.getJDA().getShardManager().shutdown(); System.out.println("Bot shut down via Command..."); System.exit(0); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION, builder).build()).queue(); } } 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 be8d3c5..061b67d 100644 --- a/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java +++ b/src/main/java/com/bbn/hadder/commands/owner/TestCommand.java @@ -24,7 +24,7 @@ public class TestCommand implements Command { @Override public String description() { - return "Sub to bbn"; + return "Just a little Test Command"; } @Override diff --git a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java index e2e79dc..98e896d 100644 --- a/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java +++ b/src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java @@ -16,10 +16,10 @@ public class PrefixCommand implements Command { if (args.length == 1) { event.getRethink().setUserPrefix(args[0], event.getAuthor().getId()); EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue(); } else { EmbedBuilder builder = new EmbedBuilder(); - event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); + event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING, builder).setDescription("You have to set a prefix.").build()).queue(); } } @@ -30,7 +30,7 @@ public class PrefixCommand implements Command { @Override public String description() { - return "Changes the prefix"; + return "Sets a new Prefix"; } @Override diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index bd506f2..8c89d77 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -36,7 +36,7 @@ public class GuildListener extends ListenerAdapter { rethink.insertGuild(event.getGuild().getId()); EmbedBuilder builder = new EmbedBuilder(); - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) + event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder) .setTitle("Joined Server") .setThumbnail(event.getGuild().getIconUrl()) .addField("Name", event.getGuild().getName(), true) @@ -51,7 +51,7 @@ public class GuildListener extends ListenerAdapter { public void onGuildLeave(GuildLeaveEvent event) { EmbedBuilder builder = new EmbedBuilder(); - event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder) + event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder) .setTitle("Left Server") .setThumbnail(event.getGuild().getIconUrl()) .addField("Name", event.getGuild().getName(), true) diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index cc7b3dc..07e2cc3 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -28,7 +28,7 @@ public class MentionListener extends ListenerAdapter { .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); - event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).build()).queue(); + event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).build()).queue(); } } } diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index bb00fa4..6bd21cf 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -28,8 +28,8 @@ public class PrivateMessageListener extends ListenerAdapter { .setDescription(event.getMessage().getContentRaw()) .setTimestamp(Instant.now()); - Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue(); - Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue(); + Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, message).build()).queue(); + Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, message).build()).queue(); } } } diff --git a/src/main/java/com/bbn/hadder/utils/BotList.java b/src/main/java/com/bbn/hadder/utils/BotList.java index b8adadc..e3352a5 100644 --- a/src/main/java/com/bbn/hadder/utils/BotList.java +++ b/src/main/java/com/bbn/hadder/utils/BotList.java @@ -82,7 +82,7 @@ public class BotList { try { new OkHttpClient().newCall(discordbotlist).execute().close(); - System.out.println("Successfully posted count for the Discord Bot List"); + System.out.println("Successfully posted count for the Discord Bot List!"); } catch (IOException e) { e.printStackTrace(); } @@ -122,7 +122,7 @@ public class BotList { Request yetanotherbotlist = new Request.Builder() .url(YetAnotherBotList) .post(body) - .addHeader("Authorization", config.getDiscordExtremeListToken()) + .addHeader("Authorization", config.getYetAnotherBotListToken()) .build(); try { @@ -142,7 +142,7 @@ public class BotList { try { new OkHttpClient().newCall(discordextremelist).execute().close(); - System.out.println("Successfully posted count to Discord Extreme List!"); + System.out.println("Successfully posted count to the Discord Extreme List!"); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 3b6324d..4ab9ee7 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -6,7 +6,7 @@ import java.awt.*; public class MessageEditor { - public EmbedBuilder setDefaultSettings(Messagetype type, EmbedBuilder embedBuilder) { + public EmbedBuilder setDefaultSettings(MessageType type, EmbedBuilder embedBuilder) { switch (type) { case INFO: embedBuilder.setColor(new Color(47,94,105)); @@ -31,7 +31,7 @@ public class MessageEditor { return embedBuilder; } - public enum Messagetype { + public enum MessageType { ERROR, WARNING, INFO, -- 2.45.3