Merge pull request #183 from BigBotNetwork/greg-dev

Coldfix

src/main/java/com/bbn/hadder/Hadder.java

@@ -87,6 +87,7 @@ public class Hadder {
                         new SoloCommand(),
                         new RegionChangeCommand(),
                         new AboutCommand(),
+                        new LanguageCommand(),
                         new LinkCommand()), config, helpCommand);
 
         builder.addEventListeners(

src/main/java/com/bbn/hadder/Rethink.java

@@ -143,7 +143,7 @@ public class Rethink {
     }
 
     public void insertGuild(String id) {
-        this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false));
+        this.insert("server", r.hashMap("id", id).with("prefix", "h.").with("links", "[]").with("linkchannel", "").with("message_id", "").with("role_id", "").with("invite_detect", false).with("language", "EN"));
     }
 
     public void insertUser(String id) {
@@ -185,4 +185,8 @@ public class Rethink {
         return (Boolean) this.get("server", "id", guild_id, "invite_detect");
     }
 
+    public void setLanguage(String user_id, String language) {
+        this.update("users", user_id, "language", language);
+    }
+
 }

src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java

@@ -35,7 +35,7 @@ public class AvatarCommand implements Command {
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
         } else {
-            event.getHelpCommand().sendHelp(this , event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

src/main/java/com/bbn/hadder/commands/fun/GifCommand.java

@@ -39,7 +39,7 @@ public class GifCommand implements Command {
             } catch (Exception e) {
                 event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription("Please try again with another term.").build()).queue();
             }
-        } else event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+        } else event.getHelpCommand().sendHelp(this, event);
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/general/HelpCommand.java

@@ -1,13 +1,10 @@
 package com.bbn.hadder.commands.general;
 
-import com.bbn.hadder.Rethink;
 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.TextChannel;
-import net.dv8tion.jda.api.entities.User;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,7 +45,7 @@ public class HelpCommand implements Command {
                 for (Command cmd : event.getCommandHandler().getCommandList()) {
                     for (String label : cmd.labels()) {
                         if (label.equalsIgnoreCase(args[0])) {
-                            sendHelp(cmd, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                            sendHelp(cmd, event);
                         }
                     }
                 }
@@ -58,15 +55,15 @@ public class HelpCommand implements Command {
         }
     }
 
-    public void sendHelp(Command cmd, Rethink rethink, User author, TextChannel channel) {
+    public void sendHelp(Command cmd, CommandEvent event) {
         if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
-                (author.getId().equals("477141528981012511") || author.getId().equals("261083609148948488")))) {
+                (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
             EmbedBuilder eb = new EmbedBuilder();
             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", rethink.getUserPrefix(author.getId()) + cmd.labels()[0] + " " + cmd.usage(), false);
+            eb.addField("Usage", event.getRethink().getUserPrefix(event.getAuthor().getId()) + cmd.labels()[0] + " " + cmd.usage(), false);
             new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO);
-            channel.sendMessage(eb.build()).queue();
+            event.getChannel().sendMessage(eb.build()).queue();
         }
     }
 

src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java

@@ -27,7 +27,7 @@ public class ScreenShareCommand implements Command {
                         event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
                                 .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();
-                        event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                        event.getHelpCommand().sendHelp(this, event);
                         return;
                     }
                 }
@@ -53,20 +53,20 @@ public class ScreenShareCommand implements Command {
 
                                 event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
                                         .setTitle("You specified a wrong number!").build()).queue();
-                                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                                event.getHelpCommand().sendHelp(this, event);
                             }
                         } catch (NumberFormatException e) {
                             event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
                                     .setTitle("Wait, that's illegal")
                                     .setDescription("This isn't a Number.").build()).queue();
-                            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                            event.getHelpCommand().sendHelp(this, event);
                         }
                     }, event.getJDA(), event.getAuthor());
                 } else if (vcs.size()==0) {
                     event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
                             .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();
-                    event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                    event.getHelpCommand().sendHelp(this, event);
                 } else {
                     event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
                             .setTitle("Here's your Url to share your Screen")
@@ -74,7 +74,7 @@ public class ScreenShareCommand implements Command {
                 }
             }
         } else {
-            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

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

@@ -32,7 +32,7 @@ public class BanCommand implements Command {
                         event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setTitle("Not possible").setDescription("You can't ban yourself!").build()).queue();
                     }
                 } else if (event.getMessage().getMentionedMembers().size() == 0) {
-                    event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                    event.getHelpCommand().sendHelp(this, event);
                 } else if (event.getMessage().getMentionedMembers().size() > 1) {
                     for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
                         Member member = event.getMessage().getMentionedMembers().get(i);

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

@@ -12,6 +12,7 @@ import net.dv8tion.jda.api.entities.Message;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 
 public class ClearCommand implements Command {
@@ -24,16 +25,22 @@ public class ClearCommand implements Command {
                     try {
                         int nbToDelete = Integer.parseInt(args[0]);
                         if(nbToDelete < 1 || nbToDelete > 200) {
-                            event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You have to choose a number between 1 and 200!").build()).queue();
+                            event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You have to choose a number between 1 and 99!").build()).queue();
                             return;
                         }
                         List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete();
                         List<Message> msgToDelete = new ArrayList<>();
                         msgToDelete.addAll(history);
                         event.getTextChannel().deleteMessages(msgToDelete).queue();
-                        event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue();
+                        Message msg = event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).complete();
+                        try {
+                            TimeUnit.SECONDS.sleep(2);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        msg.delete().queue();
                     } catch (NumberFormatException e) {
-                        event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                        event.getHelpCommand().sendHelp(this, event);
                     }
                 } else {
                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
@@ -42,7 +49,7 @@ public class ClearCommand implements Command {
                 event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
             }
         } else {
-            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

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

@@ -19,7 +19,7 @@ public class GuildPrefixCommand implements Command {
                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("The prefix must not contain **\"**").build()).queue();
                 }
             } else {
-                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                event.getHelpCommand().sendHelp(this, event);
             }
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

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

@@ -51,7 +51,7 @@ public class InviteDetectCommand implements Command {
                 event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
             }
         } else {
-            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

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

@@ -33,7 +33,7 @@ public class KickCommand implements Command {
                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("You can't kick yourself.").build()).queue();
                 }
             } else if (event.getMessage().getMentionedMembers().size() == 0) {
-                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                event.getHelpCommand().sendHelp(this, event);
             } else if (event.getMessage().getMentionedMembers().size() > 1) {
                 for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
                     Member member = event.getMessage().getMentionedMembers().get(i);

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

@@ -9,7 +9,7 @@ import net.dv8tion.jda.api.entities.Guild;
 public class LinkCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+        if (args.length == 0) event.getHelpCommand().sendHelp(this, event);
         switch (args[0].toLowerCase()) {
             case "add":
                 if (args.length != 2) return;

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

@@ -28,7 +28,7 @@ public class NickCommand implements Command {
                                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully nicked ✅").setDescription("I successfully nicked " + event.getMessage().getMentionedMembers().get(0).getUser().getAsTag() + ".").build()).queue();
                                 }
                             } else {
-                                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                                event.getHelpCommand().sendHelp(this, event);
                             }
                         } else {
                             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
@@ -43,7 +43,7 @@ public class NickCommand implements Command {
                         }
                     }
                 } else if (event.getMessage().getMentionedMembers().size() == 0) {
-                    event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                    event.getHelpCommand().sendHelp(this, event);
                 } else {
                     for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
                         Member member = event.getMessage().getMentionedMembers().get(i);

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

@@ -67,7 +67,7 @@ public class RoleCommand implements Command {
                 event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
             }
         } else {
-            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

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

@@ -77,7 +77,12 @@ public class RulesCommand implements Command {
                             if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size() > 0) {
                                 Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
                                 setRole(event, channel, message, event3, role);
-                            } // TODO
+                            } else {
+                                event3.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
+                                        .setTitle("Role does not exist")
+                                        .setDescription("The specified role does not exist on this guild.")
+                                        .build()).queue();
+                            }
                         }
                     }, event.getJDA(), event.getAuthor());
                 }, event.getJDA(), event.getAuthor());

src/main/java/com/bbn/hadder/commands/music/JoinCommand.java

@@ -19,11 +19,18 @@ public class JoinCommand implements Command {
             AudioManager audioManager = event.getGuild().getAudioManager();
             if(!audioManager.isAttemptingToConnect()) {
                 VoiceChannel vc = event.getMember().getVoiceState().getChannel();
+                if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
                     event.getGuild().getAudioManager().openAudioConnection(vc);
                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
                             .setTitle("Successfully connected")
                             .setDescription("I successfully connected to " + vc.getName() + ".")
                             .build()).queue();
+                    } else {
+                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
+                            .setTitle("Already connected")
+                            .setDescription("I am already connected to your voice channel.")
+                            .build()).queue();
+                }
             } else {
                 event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
                         .setTitle("Already trying to connect")

src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java

@@ -77,7 +77,7 @@ public class EvalCommand implements Command {
                 }, 0, TimeUnit.MILLISECONDS);
 
             } else {
-                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                event.getHelpCommand().sendHelp(this, event);
             }
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java

@@ -22,7 +22,7 @@ public class GuildLeaveCommand implements Command {
                         .setDescription("I successfully left " + guild.getName())
                         .build()).queue();
             } else {
-                event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+                event.getHelpCommand().sendHelp(this, event);
             }
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();

src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java

@@ -0,0 +1,44 @@
+package com.bbn.hadder.commands.settings;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
+
+public class LanguageCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length == 1) {
+            switch (args[0].toLowerCase()) {
+                case "DE":
+                    event.getRethink().setLanguage(event.getAuthor().getId(), "DE");
+                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
+                            .setTitle("Language set")
+                            .setDescription("German is your new language now.")
+                            .build()).queue();
+                    break;
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"language"};
+    }
+
+    @Override
+    public String description() {
+        return "Sets the new primary language for a user.";
+    }
+
+    @Override
+    public String usage() {
+        return "<Language code>";
+    }
+}

src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java

@@ -16,7 +16,7 @@ public class PrefixCommand implements Command {
             event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
         } else {
-            event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
+            event.getHelpCommand().sendHelp(this, event);
         }
     }
 

src/main/java/com/bbn/hadder/listener/RulesListener.java

@@ -30,14 +30,7 @@ public class RulesListener extends ListenerAdapter {
                     }
                 }
             } else if (event.getReactionEmote().isEmoji()) {
-                if (event.getReactionEmote().getEmoji().equals(rethink.getRulesAEmote(event.getGuild().getId()))) {
                 event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (event.getReactionEmote().getEmoji().equals(rethink.getRulesDEmote(event.getGuild().getId()))) {
-                    event.getReaction().removeReaction(event.getUser()).queue();
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                        event.getMember().kick().reason("Declined the rules");
-                    }
-                }
             }
         }
     }