New permission system

!!!

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

@@ -6,15 +6,16 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 
+@Perms(Perm.BAN_MEMBERS)
 public class BanCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (event.getMessage().getMentionedMembers().size() == 1) {
             Member victim = event.getMessage().getMentionedMembers().get(0);
             if (!event.getAuthor().getId().equals(victim.getId())) {
@@ -77,9 +78,6 @@ public class BanCommand implements Command {
                     "commands.moderation.ban.massban.success.description",
                     String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
         }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     @Override
@@ -94,6 +92,6 @@ public class BanCommand implements Command {
 
     @Override
     public String usage() {
-        return "<@User>";
+        return "user";
     }
 }

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

@@ -6,6 +6,8 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Message;
@@ -14,14 +16,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-
+@Perms(Perm.MANAGE_MESSAGES)
 public class ClearCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (args.length > 0) {
-            if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE)  || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) {
-                if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) {
                 if (args[0].equals("all")) {
                     List<Message> msg = event.getTextChannel().getIterableHistory().complete();
                     for (Message message : msg) {
@@ -67,9 +68,6 @@ public class ClearCommand implements Command {
             } else {
                 event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
             }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-            }
         } else {
             event.getHelpCommand().sendHelp(this, event);
         }

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

@@ -6,15 +6,17 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 
+@Perms(Perm.MANAGE_SERVER)
 public class InviteDetectCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 1) {
-            if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
             String opinion = args[0].toLowerCase();
             switch (opinion) {
                 case "on":
@@ -52,9 +54,6 @@ public class InviteDetectCommand implements Command {
                     }
                     break;
             }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-            }
         } else {
             event.getHelpCommand().sendHelp(this, event);
         }

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

@@ -6,16 +6,16 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 
-
+@Perms(Perm.KICK_MEMBERS)
 public class KickCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (event.getMessage().getMentionedMembers().size() == 1) {
             Member victim = event.getMessage().getMentionedMembers().get(0);
             if (!event.getAuthor().getId().equals(victim.getId())) {
@@ -55,14 +55,13 @@ public class KickCommand implements Command {
                             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
                         }
                     } else {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title","commands.moderation.kick.myself.error.description").build()).queue();
+                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
                     }
                 } else {
                     event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
                 }
             }
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,"commands.moderation.kick.success.title", "✅","commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
+            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
-            }
         }
     }
 
@@ -78,6 +77,6 @@ public class KickCommand implements Command {
 
     @Override
     public String usage() {
-        return "<@User>";
+        return "user";
     }
 }

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

@@ -6,15 +6,17 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 
+@Perms(Perm.CHANGE_NICKNAME)
 public class NickCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) {
             if (event.getMessage().getMentionedMembers().size() == 1) {
                 if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) {
@@ -89,9 +91,6 @@ public class NickCommand implements Command {
         } else {
             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     @Override

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

@@ -2,14 +2,16 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 
+@Perms(Perm.MANAGE_SERVER)
 public class PrefixCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (args.length == 1) {
             if (!args[0].contains("\"")) {
 
@@ -31,9 +33,6 @@ public class PrefixCommand implements Command {
         } else {
             event.getHelpCommand().sendHelp(this, event);
         }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     @Override

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

@@ -6,16 +6,18 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.Region;
 
+@Perms(Perm.MANAGE_SERVER)
 public class RegionChangeCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 1) {
-            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_SERVER)) {
             if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
                 switch (args[0].toLowerCase()) {
                     case "amsterdam":
@@ -82,8 +84,8 @@ public class RegionChangeCommand implements Command {
                                         .build()).queue();
                         break;
                 }
-                } else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
+            } else
-            } else event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         } else event.getTextChannel().sendMessage(
                 event.getMessageEditor().getMessage(
                         MessageEditor.MessageType.INFO,

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

@@ -2,18 +2,21 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 
+@Perms(Perm.MANAGE_ROLES)
 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) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
+
                 String action = args[0].toLowerCase();
                 switch (action) {
                     case "add":
@@ -75,9 +78,6 @@ public class RoleCommand implements Command {
             } else {
                 event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
             }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-            }
         } else {
             event.getHelpCommand().sendHelp(this, event);
         }

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

@@ -6,6 +6,8 @@ package com.bbn.hadder.commands.moderation;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.EventWaiter;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.Permission;
@@ -15,11 +17,11 @@ import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 
+@Perms(Perm.MANAGE_SERVER)
 public class RulesCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
             event.getTextChannel().sendMessage(
                     event.getMessageEditor().getMessage(
@@ -55,9 +57,6 @@ public class RulesCommand implements Command {
         } else {
             event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) {

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

@@ -6,6 +6,7 @@ import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.entities.TextChannel;
 
 public class StarBoardCommand implements Command {
+
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (event.getMessage().getMentionedChannels().size()==1) {

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

@@ -16,7 +16,6 @@ public class GuildLeaveCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (args.length > 0) {
             Guild guild = event.getJDA().getGuildById(args[0]);
             try {
@@ -34,7 +33,6 @@ public class GuildLeaveCommand implements Command {
             event.getHelpCommand().sendHelp(this, event);
         }
     }
-    }
 
     @Override
     public String[] labels() {

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

@@ -10,7 +10,6 @@ import com.bbn.hadder.utils.MessageEditor.MessageType;
  * @author Skidder / GregTCLTK
  */
 
-@Perms(Perm.BOT_OWNER)
 public class TestCommand implements Command {
 
     @Override

src/main/java/com/bbn/hadder/core/Perm.java

@@ -1,14 +1,11 @@
-/*
- * @author Hax / Hax6775 / Schlauer_Hax
- */
-
 package com.bbn.hadder.core;
 
 import com.bbn.hadder.commands.CommandEvent;
 import net.dv8tion.jda.api.Permission;
 
-/*
+/**
  * @author Skidder / GregTCLTK
+ * @author Hax / Hax6775 / Schlauer_Hax
  */
 
 public enum Perm {
@@ -22,55 +19,55 @@ public enum Perm {
     MANAGE_MESSAGES {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.MESSAGE_MANAGE);
+            return event.getMember().hasPermission(Permission.MESSAGE_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     EMBED_MESSAGES {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS);
+            return event.getMember().hasPermission(Permission.MESSAGE_EMBED_LINKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     BAN_MEMBERS {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.BAN_MEMBERS);
+            return event.getMember().hasPermission(Permission.BAN_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     KICK_MEMBERS {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.KICK_MEMBERS);
+            return event.getMember().hasPermission(Permission.KICK_MEMBERS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     MANAGE_SERVER {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.MANAGE_SERVER);
+            return event.getMember().hasPermission(Permission.MANAGE_SERVER) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     MANAGE_ROLES {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.MANAGE_ROLES);
+            return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     CHANGE_NICKNAME {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.NICKNAME_CHANGE);
+            return event.getMember().hasPermission(Permission.NICKNAME_CHANGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     ADMINISTRATOR {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.ADMINISTRATOR);
+            return event.getMember().hasPermission(Permission.ADMINISTRATOR) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
         },
     MANAGE_WEBHOOKS {
         @Override
         public boolean check(CommandEvent event) {
-            return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS);
+            return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
         }
     };
 

src/main/java/com/bbn/hadder/core/Perms.java

@@ -1,14 +1,11 @@
-/*
- * @author Hax / Hax6775 / Schlauer_Hax
- */
-
 package com.bbn.hadder.core;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-/*
+/**
  * @author Skidder / GregTCLTK
+ * @author Hax / Hax6775 / Schlauer_Hax
  */
 
 @Retention(RetentionPolicy.RUNTIME)

src/main/resources/Translations/Translations_en.properties

@@ -4,6 +4,7 @@
 
 Hadder = Hadder
 
+user = <@User>
 searchterm = <SearchTerm>
 username = <Username>
 number = <Number>/all