Merge pull request #74 from BigBotNetwork/greg-dev

Greg dev

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 RoleCommand()), config);
        
         builder.addEventListeners(
                 new MentionListener(rethink),

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 "<Searchterm>";
+        return "<SearchTerm>";
     }
 }

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("\\.");
+                        String[] ps = entry.getKey().split("\\.");
-                        eb.addField(packagesplit[packagesplit.length - 1], sb.toString(), false);
+                        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]";
     }
 }

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.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, builder).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue());
-            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

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

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

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

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 "<voicechannelid|voicechannelname>";
+        return "<VoiceChannelID|VoiceChannelName>";
     }
 }

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

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<Message> 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

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

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

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

src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java

@@ -0,0 +1,75 @@
+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) {
+        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() > 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();
+                                            } 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();
+                }
+            } 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[]{"role", "roles"};
+    }
+
+    @Override
+    public String description() {
+        return "Adds and removes roles from one or more user";
+    }
+
+    @Override
+    public String usage() {
+        return "<@role> <@user>";
+    }
+}

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

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

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
@@ -21,7 +24,7 @@ public class TestCommand implements Command {
 
     @Override
     public String description() {
-        return "Sub to bbn";
+        return "Just a little Test Command";
     }
 
     @Override

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

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)

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

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();
+                Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, message).build()).queue();
-                Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, message).build()).queue();
+                Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO, message).build()).queue();
             }
         }
     }

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

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,