Merge pull request #230 from BigBotNetwork/greg-dev

Merged!

README.md

@@ -7,6 +7,8 @@ Hadder Discord is a multi-purpose Discord bot with 100% uptime.
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&utm_medium=referral&utm_content=BigBotNetwork/Hadder&utm_campaign=Badge_Grade)
 [![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder)
 [![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
+[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues)
+[![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE)
 
 <a href="https://discordextremelist.xyz/bots/Hadder"><img src="https://discordextremelist.xyz/api/bot/637002314162372639/widget"/></a>
 [![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639)

example-config.json

@@ -20,5 +20,6 @@
     "DiscordBotReviews": "",
     "DiscordBots": "",
     "BotListSpace": ""
-  }
+  },
+  "Clyde": ""
 }

pom.xml

@@ -16,12 +16,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>

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

@@ -47,7 +47,7 @@ public class Hadder {
                         helpCommand,
                         new TestCommand(),
                         new BanCommand(),
-                        new PrefixCommand(),
+                        new UserPrefixCommand(),
                         new ShutdownCommand(),
                         new KickCommand(),
                         new PingCommand(),
@@ -58,7 +58,7 @@ public class Hadder {
                         new EqualsCommand(),
                         new InviteCommand(),
                         new NickCommand(),
-                        new GuildPrefixCommand(),
+                        new PrefixCommand(),
                         new BlowjobCommand(),
                         new PornCommand(),
                         new AnalCommand(),
@@ -87,7 +87,8 @@ public class Hadder {
                         new RegionChangeCommand(),
                         new AboutCommand(),
                         new LanguageCommand(),
-                        new SetStarBoardCommand()), config, helpCommand);
+                        new ClydeCommand(),
+                        new StarBoardCommand()), config, helpCommand);
 
         builder.addEventListeners(
                 new MentionListener(rethink),

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

@@ -81,6 +81,10 @@ public class Rethink {
         return out;
     }
 
+    public void remove(String table, String where, String wherevalue) {
+        r.table(table).filter(row -> row.g(where.toLowerCase()).eq(wherevalue)).delete().run(conn);
+    }
+
     public void setup() {
         try {
             r.dbCreate("Hadder").run(conn);
@@ -156,15 +160,19 @@ public class Rethink {
     }
 
     public void insertStarboardMessage(String messageid, String guildid, String starboardmessageid) {
-        this.insert("stars", r.hashMap("msg", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid));
+        this.insert("stars", r.hashMap("id", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid));
     }
 
     public String getStarboardMessage(String messageid) {
-        return (String) this.get("stars", "msg", messageid, "starboardmsg");
+        return (String) this.get("stars", "id", messageid, "starboardmsg");
+    }
+
+    public void removeStarboardMessage(String messageid) {
+        this.remove("stars", "id", messageid);
     }
 
     public boolean hasStarboardMessage(String messageid) {
-        return this.get("stars", "msg", messageid, "guild") != null;
+        return this.get("stars", "id", messageid, "guild") != null;
     }
 
     public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {

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

@@ -19,7 +19,9 @@ public class AvatarCommand implements Command {
                     event.getMessageEditor().getMessage(
                             MessageEditor.MessageType.INFO,
                             "commands.fun.avatar.success.title",
-                            member.getUser().getAsTag())
+                            member.getUser().getAsTag(),
+                            "",
+                            "")
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();

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

@@ -0,0 +1,77 @@
+package com.bbn.hadder.commands.fun;
+
+/*
+ * @author Skidder / GregTCLTK
+ */
+
+import club.minnced.discord.webhook.WebhookClient;
+import club.minnced.discord.webhook.WebhookClientBuilder;
+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.Icon;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Webhook;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+
+@Perms(Perm.MANAGE_WEBHOOKS)
+public class ClydeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent event) {
+        if (args.length > 0) {
+            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_WEBHOOKS)) {
+                TextChannel channel = event.getMessage().getTextChannel();
+                String content = event.getMessage().getContentRaw().replace(event.getRethink().getGuildPrefix(event.getGuild().getId()), "").replace(event.getRethink().getUserPrefix(event.getAuthor().getId()), "").replace("clyde", "");
+
+                Webhook webhook = channel.createWebhook(event.getConfig().getClydeName()).complete();
+                try {
+                    InputStream s = new URL("https://discordapp.com/assets/f78426a064bc9dd24847519259bc42af.png").openStream();
+                    webhook.getManager().setAvatar(Icon.from(s)).queue();
+
+                    WebhookClientBuilder builder = new WebhookClientBuilder(webhook.getUrl());
+
+                    WebhookClient client = builder.build();
+                    try {
+                        TimeUnit.SECONDS.sleep(1);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    client.send(content);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    TimeUnit.SECONDS.sleep(2);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                webhook.delete().queue();
+            } else {
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+            }
+        } else event.getHelpCommand().sendHelp(this, event);
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"clyde"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.clyde.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "content";
+    }
+}

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/GuildPrefixCommand.java

@@ -1,53 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-
-public class GuildPrefixCommand 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("\"")) {
-
-                    event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.moderation.prefix.success.title",
-                            "✅",
-                            "commands.moderation.prefix.success.description",
-                            args[0]).build()
-                    ).queue();
-                } else {
-                    event.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.WARNING,
-                                    "",
-                                    "commands.moderation.prefix.error.description").build()).queue();
-                }
-            } else {
-                event.getHelpCommand().sendHelp(this, event);
-            }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"guildprefix"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.prefix.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "guildprefix";
-    }
-}

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())) {
@@ -64,7 +64,6 @@ public class KickCommand implements Command {
             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();
         }
     }
-    }
 
     @Override
     public String[] labels() {
@@ -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

@@ -0,0 +1,52 @@
+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 (args.length == 1) {
+            if (!args[0].contains("\"")) {
+
+                event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.moderation.prefix.success.title",
+                        "✅",
+                        "commands.moderation.prefix.success.description",
+                        args[0]).build()
+                ).queue();
+            } else {
+                event.getTextChannel().sendMessage(
+                        event.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.WARNING,
+                                "",
+                                "commands.moderation.prefix.error.description").build()).queue();
+            }
+        } else {
+            event.getHelpCommand().sendHelp(this, event);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"prefix"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.moderation.prefix.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "prefix";
+    }
+}

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

@@ -3,10 +3,10 @@ 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.entities.TextChannel;
 
-public class SetStarBoardCommand implements Command {
+public class StarBoardCommand implements Command {
+
     @Override
     public void executed(String[] args, CommandEvent event) {
         if (event.getMessage().getMentionedChannels().size()==1) {
@@ -35,7 +35,7 @@ public class SetStarBoardCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"setstarboard"};
+        return new String[]{"starboard"};
     }
 
     @Override

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

@@ -7,6 +7,8 @@ package com.bbn.hadder.commands.owner;
 import com.bbn.hadder.Hadder;
 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 javax.script.ScriptEngine;
@@ -16,11 +18,11 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+@Perms(Perm.BOT_OWNER)
 public class EvalCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         if (args.length > 0) {
             ScriptEngine engine = new ScriptEngineManager().getEngineByName("nashorn");
 
@@ -84,11 +86,6 @@ public class EvalCommand 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/owner/GuildLeaveCommand.java

@@ -6,16 +6,19 @@ package com.bbn.hadder.commands.owner;
 
 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.entities.Guild;
 
+@Perms(Perm.BOT_OWNER)
 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 {
                 guild.leave().queue();
                 event.getTextChannel()
                         .sendMessage(event.getMessageEditor()
@@ -23,13 +26,11 @@ public class GuildLeaveCommand implements Command {
                                         "", "commands.owner.guildleave.success.description", guild.getName())
                                 .build())
                         .queue();
-            } else {
+            } catch (Exception e) {
-                event.getHelpCommand().sendHelp(this, event);
+                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
             }
         } else {
-            event.getTextChannel()
+            event.getHelpCommand().sendHelp(this, event);
-                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
-                    .queue();
         }
     }
 

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

@@ -6,18 +6,15 @@ package com.bbn.hadder.commands.owner;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.core.Perm;
-
+import com.bbn.hadder.core.Perms;
 
+@Perms(Perm.BOT_OWNER)
 public class RebootCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         Runtime.getRuntime().exit(69);
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     @Override

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

@@ -6,20 +6,19 @@ package com.bbn.hadder.commands.owner;
 
 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;
 
+@Perms(Perm.BOT_OWNER)
 public class ShutdownCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent event) {
-        if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
         event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
         event.getJDA().getShardManager().shutdown();
         System.out.println("Bot shut down via Command...");
         Runtime.getRuntime().exit(69);
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
-        }
     }
 
     @Override

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

@@ -2,7 +2,8 @@ package com.bbn.hadder.commands.owner;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
+import com.bbn.hadder.core.Perm;
+import com.bbn.hadder.core.Perms;
 import com.bbn.hadder.utils.MessageEditor.MessageType;
 
 /*

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

@@ -8,7 +8,7 @@ import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 
-public class PrefixCommand implements Command {
+public class UserPrefixCommand implements Command {
 
     public void executed(String[] args, CommandEvent event) {
         if (args.length == 1) {
@@ -26,7 +26,7 @@ public class PrefixCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "prefix" };
+        return new String[] { "userprefix" };
     }
 
     @Override
@@ -36,6 +36,6 @@ public class PrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "prefix";
+        return "userprefix";
     }
 }

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

@@ -7,6 +7,7 @@ import com.bbn.hadder.commands.general.HelpCommand;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
+import java.util.Arrays;
 import java.util.List;
 
 public class CommandHandler {
@@ -31,10 +32,23 @@ public class CommandHandler {
                     if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", "");
                     String[] args = argString.split(" ");
                     if (args.length > 0 && args[0].equals("")) args = new String[0];
-                    cmd.executed(args,
+
-                            new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
+                    CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
-                                    config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()))
+                            config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()));
-                    );
+                    if (cmd.getClass().getAnnotations().length>0) {
+                        if (!Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
+                            for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
+                                if (!perm.check(commandEvent)) {
+                                    commandEvent.getTextChannel()
+                                            .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
+                                            .queue();
+                                    return;
+                                }
+                            }
+                        }
+                    }
+
+                    cmd.executed(args, commandEvent);
                     return;
                 }
             }

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

@@ -63,6 +63,7 @@ public class Config {
                 .value("DiscordExtremeList").value(null)
                 .value("DiscordBotReviews").value(null)
                 .value("DiscordBots").value(null)
+                .value("BotListSpace").value(null)
                 .endObject().endObject().toString();
     }
 
@@ -141,4 +142,8 @@ public class Config {
     public String getBotListSpaceToken() {
         return config.getJSONObject("Tokens").getString("BotListSpace");
     }
+
+    public String getClydeName() {
+        return config.getString("Clyde");
+    }
 }

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

@@ -0,0 +1,75 @@
+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 {
+
+    BOT_OWNER() {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_MESSAGES {
+        @Override
+        public boolean check(CommandEvent event) {
+            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) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    BAN_MEMBERS {
+        @Override
+        public boolean check(CommandEvent event) {
+            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) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_SERVER {
+        @Override
+        public boolean check(CommandEvent event) {
+            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) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    CHANGE_NICKNAME {
+        @Override
+        public boolean check(CommandEvent event) {
+            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) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+        },
+    MANAGE_WEBHOOKS {
+        @Override
+        public boolean check(CommandEvent event) {
+            return event.getMember().hasPermission(Permission.MANAGE_WEBHOOKS) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong());
+        }
+    };
+
+    public abstract boolean check(CommandEvent event);
+}

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

@@ -0,0 +1,14 @@
+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)
+public @interface Perms {
+    Perm[] value() default {};
+}

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

@@ -3,13 +3,13 @@ package com.bbn.hadder.listener;
 import com.bbn.hadder.Rethink;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.MessageReaction;
 import net.dv8tion.jda.api.events.message.react.GenericMessageReactionEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 import javax.annotation.Nonnull;
-import java.time.format.DateTimeFormatter;
 
 public class StarboardListener extends ListenerAdapter {
 
@@ -33,34 +33,68 @@ public class StarboardListener extends ListenerAdapter {
         if (event.getReaction().getReactionEmote().getName().equals("⭐")) {
             if (!rethink.hasStarboardMessage(event.getMessageId())) {
                 if (rethink.hasStarboardChannel(event.getGuild().getId())) {
-                    event.getChannel().retrieveMessageById(event.getMessageId()).queue(msg -> {
+
+                    event.getTextChannel().retrieveMessageById(event.getMessageId()).queue(
+                            msg -> {
+                                Integer stars = 0;
+                                for (MessageReaction reaction : msg.getReactions()) {
+                                    if (reaction.getReactionEmote().getName().equals("⭐")) {
+                                        stars = reaction.getCount();
+                                    }
+                                }
+
+                                if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= stars) {
                                     event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
                                             .sendMessage(new MessageBuilder()
                                                     .setContent("⭐ 1" + " " + event.getTextChannel().getAsMention())
                                                     .setEmbed(
                                                             new EmbedBuilder()
-                                                        .setAuthor(event.getUser().getAsTag())
+                                                                    .setAuthor(msg.getAuthor().getAsTag())
                                                                     .setDescription(msg.getContentRaw())
                                                                     .setTimestamp(msg.getTimeCreated()).build()).build()).queue(
                                             starboardmsg -> {
                                                 rethink.insertStarboardMessage(msg.getId(), event.getGuild().getId(), starboardmsg.getId());
                                             }
                                     );
-                    });
                                 }
-            } else {
-                event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
-                        .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
-                        msg -> {
-                            msg.editMessage(new MessageBuilder()
-                                    .setContent("⭐" + event.getReaction().getCount() + " " + event.getTextChannel().getAsMention())
-                                    .setEmbed(
-                                            new EmbedBuilder()
-                                                    .setAuthor(event.getUser().getAsTag())
-                                                    .setDescription(msg.getContentRaw())
-                                                    .setTimestamp(msg.getTimeCreated()).build()).build()).queue();
                             }
                     );
+
+                }
+            } else {
+
+                event.getTextChannel().retrieveMessageById(event.getMessageId()).queue(
+                        msg -> {
+                            Integer stars = 0;
+                            for (MessageReaction reaction : msg.getReactions()) {
+                                if (reaction.getReactionEmote().getName().equals("⭐")) {
+                                    stars = reaction.getCount();
+                                }
+                            }
+
+                            Integer finalStars = stars;
+                            event.getGuild().getTextChannelById(rethink.getStarboardChannel(event.getGuild().getId()))
+                                    .retrieveMessageById(rethink.getStarboardMessage(event.getMessageId())).queue(
+                                    msg2 -> {
+
+                                        if (Integer.parseInt(rethink.getNeededstars(event.getGuild().getId())) <= finalStars) {
+                                            msg2.editMessage(new MessageBuilder()
+                                                    .setContent("⭐ " + finalStars + " " + event.getTextChannel().getAsMention())
+                                                    .setEmbed(
+                                                            new EmbedBuilder()
+                                                                    .setAuthor(msg.getAuthor().getAsTag())
+                                                                    .setDescription(msg.getContentRaw())
+                                                                    .setTimestamp(msg.getTimeCreated()).build()).build()).queue();
+                                        } else {
+                                            msg2.delete().queue();
+                                            rethink.removeStarboardMessage(msg.getId());
+                                        }
+                                    }
+                            );
+
+                        }
+                );
+
             }
         }
     }

src/main/java/com/bbn/hadder/utils/MessageEditor.java

@@ -35,7 +35,7 @@ public class MessageEditor {
 
     public EmbedBuilder getMessage(MessageType type, String title_language_string, String title_extra, String title_extra_two,
                             String description_language_string, String description_extra, String description_extra_two) {
-        String language = rethink.getLanguage(this.user.getId());
+        String language = (this.user!=null) ? rethink.getLanguage(this.user.getId()) : null;
         EmbedBuilder eb = this.getDefaultSettings(type);
         if (!title_language_string.equals("")) eb.setTitle(this.handle(language, title_language_string, title_extra, title_extra_two));
         if (!description_language_string.equals("")) eb.setDescription(this.handle(language, description_language_string, description_extra, description_extra_two));

src/main/resources/Translations/Translations_en.properties

@@ -2,21 +2,19 @@
 # @author Skidder / GregTCLTK
 #
 
-#
-# @author Skidder / GregTCLTK
-#
-
 Hadder = Hadder
 
+user = <@User>
 searchterm = <SearchTerm>
 username = <Username>
 number = <Number>/all
-guildprefix = <New Guild-Prefix>
 prefix = <New Prefix>
+userprefix = <New User-Prefix>
 vc-name/id = <VoiceChannelID|VoiceChannelName>
 user+nickname = <@user> <New Nickname>
 region = <region>
 guildid = <Guild-ID>
+content = <Message-content>
 
 error = Error
 none = None
@@ -29,6 +27,7 @@ commands.fun.gif.help.description = Look for a GIF on Giphy
 commands.fun.meme.success.title = Your random meme
 commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later.
 commands.fun.meme.help.description = Sends you a random meme.
+commands.fun.clyde.help.description = Send a message as a webhook named Clyde.
 
 commands.general.about.success.title = Hadder - About
 commands.general.about.success.description = Hadder is an open source Discord bot.
@@ -98,7 +97,7 @@ commands.moderation.clear.message.error.title = No messages\!
 commands.moderation.clear.message.error.description = There are no messages in this channel.
 commands.moderation.clear.help.description = Deletes the specified number of messages.
 commands.moderation.prefix.success.title = %extra% Successfully set %extra%
-commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to %extra%
+commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to `%extra%`.
 commands.moderation.prefix.error.description = The prefix must not contain **"**
 commands.moderation.prefix.help.description = Sets the Guild-Prefix.
 commands.moderation.invitedetect.activate.success.title = Successfully activated
@@ -206,6 +205,8 @@ commands.owner.eval.help.description = Execute the given code
 commands.owner.eval.help.usage = <Code to execute>
 commands.owner.guildleave.success.title = Successfully left
 commands.owner.guildleave.success.description = I successfully left %extra%.
+commands.owner.guildleave.error.title = Can not leave
+commands.owner.guildleave.error.description = I can not leave from this guild. Maybe this isn't a ID?
 commands.owner.guildleave.help.description = Quit from a guild
 commands.owner.reboot.help.description = Restart the bot
 commands.owner.shutdown.success.title = Shutdown
@@ -214,9 +215,9 @@ commands.owner.test.success = TEST my friends
 commands.owner.test.help.description = Just a little Test Command
 
 commands.settings.language.success.title = Language set
-commands.settings.language.success.description = %extra% is your new language now.
+commands.settings.language.success.description = `%extra%` is your new language now.
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.language.help.usage = <Language code>
 commands.settings.prefix.success.title = %extra% Successfully set %extra%
-commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%.
+commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.
 commands.settings.prefix.help.description = Sets a new Prefix