From 697f3d0265c17afa5c97424470bc438a4b3b254f Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Fri, 24 Jan 2020 18:04:05 +0100
Subject: [PATCH 01/48] Update pom file

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 256bfda..ae33d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
-  <version>0.1-BETA</version>
+  <version>1.0.0</version>
 
   <name>Hadder</name>
 

From f30066308b85fbc8dfd7ccb773984d3a79458325 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 25 Jan 2020 02:05:23 +0100
Subject: [PATCH 02/48] Hey guys

---
 .../com/bbn/hadder/audio/AudioManager.java    | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java
index 051c479..05ae700 100644
--- a/src/main/java/com/bbn/hadder/audio/AudioManager.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java
@@ -130,6 +130,8 @@ public class AudioManager {
         });
     }
 
+    /*
+    TODO: DJ integration
     public boolean isDj(Member member) {
         return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
     }
@@ -137,22 +139,18 @@ public class AudioManager {
     public boolean isCurrentDj(Member member) {
         return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member);
     }
-
+*/
     public void forceSkipTrack(CommandEvent event) {
         getPlayer(event.getGuild()).stopTrack();
     }
 
-    public String getTimestamp(long milis) {
-        long seconds = milis / 1000;
-        long hours = Math.floorDiv(seconds, 3600);
-        seconds = seconds - (hours * 3600);
-        long mins = Math.floorDiv(seconds, 60);
-        seconds = seconds - (mins * 60);
-        return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
-    }
-
-    public String getOrNull(String s) {
-        return s.isEmpty() ? "N/A" : s;
+    public String getTimestamp(long m) {
+        long s = m / 1000;
+        long hours = Math.floorDiv(s, 3600);
+        s = s - (hours * 3600);
+        long minutes = Math.floorDiv(s, 60);
+        s = s - (minutes * 60);
+        return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
     }
 
 }

From 5dfbc8e71820f2b383c275f50dab4cb6d3d7487e Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 25 Jan 2020 02:13:26 +0100
Subject: [PATCH 03/48] Prepare for next JDA release

---
 .../hadder/commands/moderation/RegionChangeCommand.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
index 5ceed72..761b877 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
@@ -86,6 +86,10 @@ public class RegionChangeCommand implements Command {
                     case "us-south":
                         setRegion(Region.US_SOUTH, "US South", e);
                         break;
+                    /*case "south-korea":
+                        setRegion(Region.SOUTH_KOREA, "South Korea", e);
+                        break;
+                        TODO: Publish when JDA v4.2.0 is released*/
                     default:
                         e.getTextChannel().sendMessage(
                                 e.getMessageEditor().getMessage(
@@ -96,8 +100,7 @@ public class RegionChangeCommand implements Command {
                                         .build()).queue();
                         break;
                 }
-
-                //TODO: Maybe South Korea. Check the geo restricted discussion
+                
             } else
                 e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         } else e.getTextChannel().sendMessage(

From 53a95f78a3e7edc2dd7e09717b048ffe9548a2ee Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 25 Jan 2020 02:15:48 +0100
Subject: [PATCH 04/48] yk

---
 .../com/bbn/hadder/commands/moderation/RegionChangeCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
index 761b877..51a9e3d 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
@@ -100,7 +100,7 @@ public class RegionChangeCommand implements Command {
                                         .build()).queue();
                         break;
                 }
-                
+
             } else
                 e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         } else e.getTextChannel().sendMessage(

From 1e0da3ab8ae769101a622112cd2560041a7b9e0f Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 26 Jan 2020 11:55:52 +0100
Subject: [PATCH 05/48] oof moment

---
 .../java/com/bbn/hadder/RethinkServer.java     | 18 +++++++++---------
 src/main/java/com/bbn/hadder/RethinkUser.java  |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java
index 36af37e..c15c448 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/RethinkServer.java
@@ -24,15 +24,15 @@ public class RethinkServer {
 
     private Rethink rethink;
 
-    private String accept_emote = "";
-    private String decline_emote = "";
-    private String id;
-    private boolean invite_detect = false;
-    private String message_id = "";
-    private String neededstars = "3";
-    private String prefix = "h.";
-    private String role_id = "";
-    private String starboard = "";
+    String accept_emote = "";
+    String decline_emote = "";
+    String id;
+    boolean invite_detect = false;
+    String message_id = "";
+    String neededstars = "3";
+    String prefix = "h.";
+    String role_id = "";
+    String starboard = "";
 
     public RethinkServer(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index 94a7189..26376f5 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -24,10 +24,10 @@ public class RethinkUser {
 
     private Rethink rethink;
 
-    private String id;
-    private String prefix = "h.";
-    private String language = "en";
-    private String blacklisted = "none";
+    String id;
+    String prefix = "h.";
+    String language = "en";
+    String blacklisted = "none";
 
     public RethinkUser(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {

From 5181a4cc02bb5fbcf3846286a6779f143c8c728c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2020 13:21:48 +0000
Subject: [PATCH 06/48] Bump github-api from 1.103 to 1.105

Bumps github-api from 1.103 to 1.105.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae33d40..20907bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
-      <version>1.103</version>
+      <version>1.105</version>
     </dependency>
     <dependency>
       <groupId>com.sedmelluq</groupId>

From b2cacd77e51dae9addbc2f17cb199d5ad8e63c83 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2020 13:22:13 +0000
Subject: [PATCH 07/48] Bump lavaplayer from 1.3.33 to 1.3.34

Bumps lavaplayer from 1.3.33 to 1.3.34.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae33d40..15446cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.sedmelluq</groupId>
       <artifactId>lavaplayer</artifactId>
-      <version>1.3.33</version>
+      <version>1.3.34</version>
     </dependency>
   </dependencies>
 

From 9b992b4886e607379ebfb5364852e247d66d0849 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2020 13:22:39 +0000
Subject: [PATCH 08/48] Bump JDA from 4.1.1_101 to 4.1.1_102

Bumps JDA from 4.1.1_101 to 4.1.1_102.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae33d40..569b143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_101</version>
+      <version>4.1.1_102</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From b94be60fd70b3dfc032e9a7d9809820f6c4c9ab9 Mon Sep 17 00:00:00 2001
From: Hax <arzberger52@gmail.com>
Date: Tue, 28 Jan 2020 14:21:16 +0100
Subject: [PATCH 09/48] ReactionEventWaiter

---
 .../java/com/bbn/hadder/utils/EventWaiter.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/com/bbn/hadder/utils/EventWaiter.java b/src/main/java/com/bbn/hadder/utils/EventWaiter.java
index 525dd15..2d44b8c 100644
--- a/src/main/java/com/bbn/hadder/utils/EventWaiter.java
+++ b/src/main/java/com/bbn/hadder/utils/EventWaiter.java
@@ -19,6 +19,7 @@ package com.bbn.hadder.utils;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.guild.react.GuildMessageReactionAddEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 import javax.annotation.Nonnull;
@@ -42,4 +43,20 @@ public class EventWaiter {
         jda.getShardManager().addEventListener(listener);
     }
 
+    public void newOnReactionEventWaiter(Consumer<GuildMessageReactionAddEvent> onEvent, JDA jda, User user) {
+        Object listener = new ListenerAdapter() {
+            @Override
+            public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
+                if (user==null) {
+                    onEvent.accept(event);
+                    event.getJDA().getShardManager().removeEventListener(this);
+                } else if (event.getUser().getId().equals(user.getId())) {
+                    onEvent.accept(event);
+                    event.getJDA().getShardManager().removeEventListener(this);
+                }
+            }
+        };
+        jda.getShardManager().addEventListener(listener);
+    }
+
 }

From 2fcd7551615111254f7b907737737bc8623028d6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2020 13:34:38 +0000
Subject: [PATCH 10/48] Bump JDA from 4.1.1_102 to 4.1.1_103

Bumps JDA from 4.1.1_102 to 4.1.1_103.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 50e66a1..7ad4d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_102</version>
+      <version>4.1.1_103</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From eb196cca709c3d2b1c2232d59a7728f31948f928 Mon Sep 17 00:00:00 2001
From: Hax <arzberger52@gmail.com>
Date: Tue, 28 Jan 2020 17:48:47 +0100
Subject: [PATCH 11/48] Cool Mention Listener

---
 pom.xml                                       | 28 +++++++++++++++
 .../bbn/hadder/listener/MentionListener.java  | 35 +++++++++++++++++--
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae33d40..07122e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,29 @@
     <maven.compiler.target>1.13</maven.compiler.target>
   </properties>
 
+  <developers>
+    <developer>
+      <id>Hax#6775</id>
+      <name>Hax</name>
+      <email>hax@bigbotnetwork.com</email>
+      <url>https://bigbotnetwork.com/</url>
+      <timezone>Europe/Berlin</timezone>
+      <properties>
+        <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp</picUrl>
+      </properties>
+    </developer>
+    <developer>
+      <id>Skidder#6775</id>
+      <name>Greg</name>
+      <email>skidder@bigbotnetwork.com</email>
+      <url>https://bigbotnetwork.com/</url>
+      <timezone>Europe/Berlin</timezone>
+      <properties>
+        <picUrl>https://cdn.discordapp.com/avatars/477141528981012511/a_ba4bd8e5b381874edcd06a68d1acd3aa.gif</picUrl>
+      </properties>
+    </developer>
+  </developers>
+
   <repositories>
     <repository>
       <id>jcenter</id>
@@ -24,6 +47,11 @@
   </repositories>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>3.5.4</version>
+    </dependency>
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 886ab51..d51cbe3 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -20,11 +20,17 @@ import com.bbn.hadder.Rethink;
 import com.bbn.hadder.RethinkServer;
 import com.bbn.hadder.RethinkUser;
 import com.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import javax.annotation.Nonnull;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.Random;
 
 public class MentionListener extends ListenerAdapter {
@@ -42,14 +48,39 @@ public class MentionListener extends ListenerAdapter {
             RethinkUser rethinkUser = new RethinkUser(rethink.getObjectByID("user", e.getAuthor().getId()), rethink);
             if (e.isFromType(ChannelType.TEXT) && (e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention()) ||
                     e.getMessage().getContentRaw().equals(e.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
-                e.getChannel().sendMessage(new MessageEditor(rethinkUser, e.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
+
+                MavenXpp3Reader reader = new MavenXpp3Reader();
+                Model model = null;
+                try {
+                    model = reader.read(new FileReader("pom.xml"));
+                } catch (IOException | XmlPullParserException ex) {
+                    ex.printStackTrace();
+                }
+                EmbedBuilder builder = new EmbedBuilder().setTitle("Hi!").addField("Version", model.getVersion(), false)
+                        .addField("Userprefix", rethinkUser.getPrefix(), true).addField("Guildprefix", rethinkServer.getPrefix(), true);
+                StringBuilder stringBuilder = new StringBuilder();
+                model.getDependencies().forEach(
+                        dependency -> stringBuilder.append(dependency.getArtifactId()+" - "+dependency.getVersion()+"\n")
+                );
+                builder.addField("Dependencies", stringBuilder.toString(), false);
+                StringBuilder devs = new StringBuilder();
+                model.getDevelopers().forEach(
+                        developer -> devs.append(developer.getId()+" - [Website]("+developer.getUrl()+"), [E-Mail](https://hax.bigbotnetwork.de/redirect.html?url=mailto:"+developer.getEmail()+")\n")
+                );
+                builder.addField("Developer", devs.toString(), false);
+                builder.addField("Join our Dev Server!", "[Click here!](https://discord.gg/58My2dM)", true);
+                builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)",false);
+                builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
+                e.getChannel().sendMessage(builder.build()).queue();
+
+                /*e.getChannel().sendMessage(new MessageEditor(rethinkUser, e.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
                         .setTitle("Hello I'm Hadder.")
                         .setAuthor(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl(), e.getJDA().getSelfUser().getAvatarUrl())
                         .addField("Users", String.valueOf(e.getJDA().getUsers().size()), false)
                         .addField("Guilds", String.valueOf(e.getJDA().getGuilds().size()), false)
                         .addField("Prefix (User)", rethinkUser.getPrefix(), false)
                         .addField("Prefix (Guild)", rethinkServer.getPrefix(), false)
-                        .build()).queue();
+                        .build()).queue();*/
             } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
                 int member = new Random().nextInt(e.getGuild().getMembers().size() - 1);
                 if (member > 0 && member < e.getGuild().getMembers().size()) {

From 07b8749e0b6fd514dfad22e86ba4461b416da0b5 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 28 Jan 2020 21:23:24 +0100
Subject: [PATCH 12/48] null

---
 src/main/java/com/bbn/hadder/Rethink.java        | 16 +++++++++++-----
 src/main/java/com/bbn/hadder/RethinkServer.java  | 10 +++++-----
 src/main/java/com/bbn/hadder/RethinkUser.java    |  2 +-
 .../java/com/bbn/hadder/core/CommandHandler.java |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index 6b2b137..2a14fac 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -18,6 +18,7 @@ package com.bbn.hadder;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
+import com.rethinkdb.gen.exc.ReqlNonExistenceError;
 import com.rethinkdb.gen.exc.ReqlOpFailedError;
 import com.rethinkdb.net.Connection;
 import org.json.JSONArray;
@@ -125,10 +126,10 @@ public class Rethink {
         this.insert("server", r
                 .hashMap("id", id)
                 .with("prefix", "h.")
-                .with("message_id", "")
-                .with("role_id", "")
+                .with("message_id", null)
+                .with("role_id", null)
                 .with("invite_detect", false)
-                .with("starboard", "")
+                .with("starboard", null)
                 .with("neededstars", "4")
         );
     }
@@ -143,7 +144,7 @@ public class Rethink {
 
     // TODO
     public boolean hasStarboardChannel(String guild_id) {
-        return !this.getByID("server", guild_id, "starboard").equals("");
+        return this.getByID("server", guild_id, "starboard") != null;
     }
     // TODO
     public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
@@ -159,7 +160,12 @@ public class Rethink {
     }
     // TODO
     public boolean hasStarboardMessage(String message_id) {
-        return this.getByID("stars", message_id, "guild") != null;
+        try {
+            this.getByID("stars", message_id, "guild");
+            return true;
+        } catch (ReqlNonExistenceError e) {
+            return false;
+        }
     }
 
 
diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java
index c15c448..04b11ca 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/RethinkServer.java
@@ -24,15 +24,15 @@ public class RethinkServer {
 
     private Rethink rethink;
 
-    String accept_emote = "";
-    String decline_emote = "";
+    String accept_emote = null;
+    String decline_emote = null;
     String id;
     boolean invite_detect = false;
-    String message_id = "";
+    String message_id = null;
     String neededstars = "3";
     String prefix = "h.";
-    String role_id = "";
-    String starboard = "";
+    String role_id = null;
+    String starboard = null;
 
     public RethinkServer(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index 26376f5..eba7564 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -27,7 +27,7 @@ public class RethinkUser {
     String id;
     String prefix = "h.";
     String language = "en";
-    String blacklisted = "none";
+    String blacklisted = null;
 
     public RethinkUser(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 5f2029c..99fe82a 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -69,7 +69,7 @@ public class CommandHandler {
 
                     boolean run = true;
                     String blacklisted = rethinkUser.getBlacklisted();
-                    if (!"none".equals(blacklisted)) {
+                    if (!(null == blacklisted)) {
                         for (String BLLabel : blacklisted.split(",")) {
                             if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
                                 run = false;

From 0db2933daff0965eb532867ad39d8fc05e8ce78f Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 28 Jan 2020 21:35:22 +0100
Subject: [PATCH 13/48] Some unimportant stuff yk

---
 .../bbn/hadder/listener/MentionListener.java  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index d51cbe3..f7eae4e 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -19,7 +19,6 @@ package com.bbn.hadder.listener;
 import com.bbn.hadder.Rethink;
 import com.bbn.hadder.RethinkServer;
 import com.bbn.hadder.RethinkUser;
-import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -56,31 +55,25 @@ public class MentionListener extends ListenerAdapter {
                 } catch (IOException | XmlPullParserException ex) {
                     ex.printStackTrace();
                 }
-                EmbedBuilder builder = new EmbedBuilder().setTitle("Hi!").addField("Version", model.getVersion(), false)
-                        .addField("Userprefix", rethinkUser.getPrefix(), true).addField("Guildprefix", rethinkServer.getPrefix(), true);
+                EmbedBuilder builder = new EmbedBuilder()
+                        .setTitle("Hi!")
+                        .addField("Version", model.getVersion(), false)
+                        .addField("User-Prefix", rethinkUser.getPrefix(), true)
+                        .addField("Guild-Prefix", rethinkServer.getPrefix(), true);
                 StringBuilder stringBuilder = new StringBuilder();
                 model.getDependencies().forEach(
-                        dependency -> stringBuilder.append(dependency.getArtifactId()+" - "+dependency.getVersion()+"\n")
+                        dependency -> stringBuilder.append(dependency.getArtifactId()).append(" - ").append(dependency.getVersion()).append("\n")
                 );
                 builder.addField("Dependencies", stringBuilder.toString(), false);
                 StringBuilder devs = new StringBuilder();
                 model.getDevelopers().forEach(
-                        developer -> devs.append(developer.getId()+" - [Website]("+developer.getUrl()+"), [E-Mail](https://hax.bigbotnetwork.de/redirect.html?url=mailto:"+developer.getEmail()+")\n")
+                        developer -> devs.append(developer.getId()).append(" - [Website](").append(developer.getUrl()).append("), [E-Mail](https://hax.bigbotnetwork.de/redirect.html?url=mailto:").append(developer.getEmail()).append(")\n")
                 );
                 builder.addField("Developer", devs.toString(), false);
                 builder.addField("Join our Dev Server!", "[Click here!](https://discord.gg/58My2dM)", true);
                 builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)",false);
                 builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
                 e.getChannel().sendMessage(builder.build()).queue();
-
-                /*e.getChannel().sendMessage(new MessageEditor(rethinkUser, e.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
-                        .setTitle("Hello I'm Hadder.")
-                        .setAuthor(e.getJDA().getSelfUser().getName(), e.getJDA().getSelfUser().getAvatarUrl(), e.getJDA().getSelfUser().getAvatarUrl())
-                        .addField("Users", String.valueOf(e.getJDA().getUsers().size()), false)
-                        .addField("Guilds", String.valueOf(e.getJDA().getGuilds().size()), false)
-                        .addField("Prefix (User)", rethinkUser.getPrefix(), false)
-                        .addField("Prefix (Guild)", rethinkServer.getPrefix(), false)
-                        .build()).queue();*/
             } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
                 int member = new Random().nextInt(e.getGuild().getMembers().size() - 1);
                 if (member > 0 && member < e.getGuild().getMembers().size()) {

From 54441cb67238a68a00d5f7da28f1c8430cd0832b Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Tue, 28 Jan 2020 21:40:37 +0100
Subject: [PATCH 14/48] Unimportant pom stuff

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e0e3394..f9213e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
+  <packaging>pom</packaging>
   <version>1.0.0</version>
 
   <name>Hadder</name>
@@ -13,6 +14,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.13</maven.compiler.source>
     <maven.compiler.target>1.13</maven.compiler.target>
+    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
   </properties>
 
   <developers>

From c192f4d3ce25d3dd79ba4e8d9fa07b0de2496006 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 07:13:58 +0000
Subject: [PATCH 15/48] Bump JDA from 4.1.1_103 to 4.1.1_104

Bumps JDA from 4.1.1_103 to 4.1.1_104.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9213e5..5f71b3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_103</version>
+      <version>4.1.1_104</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From e67f0d7c966995f3756da223533dd22eae77b3dd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 07:14:27 +0000
Subject: [PATCH 16/48] Bump maven-model from 3.5.4 to 3.6.3

Bumps [maven-model](https://github.com/apache/maven) from 3.5.4 to 3.6.3.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.5.4...maven-3.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9213e5..ac341d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.5.4</version>
+      <version>3.6.3</version>
     </dependency>
     <dependency>
       <groupId>net.dv8tion</groupId>

From 438816feaa9b4e5cbcc043fae407ecbffa711ba3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2020 07:14:40 +0000
Subject: [PATCH 17/48] Bump github-api from 1.105 to 1.106

Bumps github-api from 1.105 to 1.106.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f9213e5..3ebf5db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
-      <version>1.105</version>
+      <version>1.106</version>
     </dependency>
     <dependency>
       <groupId>com.sedmelluq</groupId>

From 0558b63cfc17d7e8051dad804c51375ff6ab3c4a Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 08:17:28 +0100
Subject: [PATCH 18/48] Very important fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f7a3ccf..67adf75 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Hax#6775
 | h.help         | Shows each command and explains its usage.                    |
 | h.about        | Shows information about Hadder.                               |
 | h.equals       | Checks if two strings are the same.                           |
-| h.invite       | Shows the invite link to invite Hadder to your server.    |
+| h.invite       | Shows the invite link to invite Hadder to your server.        |
 | h.ping         | Shows the ping to the Discord API.                            |
 | h.avatar       | Sends the avatar of the specified member.                     |
 | h.gif          | Looks for a GIF on Giphy.                                     |

From 6fc9dd126b559080b74e305f169d37865a2c7fed Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 08:19:04 +0100
Subject: [PATCH 19/48] Use explicit scoping instead of the default package
 private level

---
 .../java/com/bbn/hadder/RethinkServer.java     | 18 +++++++++---------
 src/main/java/com/bbn/hadder/RethinkUser.java  |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java
index 04b11ca..ee88da6 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/RethinkServer.java
@@ -24,15 +24,15 @@ public class RethinkServer {
 
     private Rethink rethink;
 
-    String accept_emote = null;
-    String decline_emote = null;
-    String id;
-    boolean invite_detect = false;
-    String message_id = null;
-    String neededstars = "3";
-    String prefix = "h.";
-    String role_id = null;
-    String starboard = null;
+    public String accept_emote = null;
+    public String decline_emote = null;
+    public String id;
+    public boolean invite_detect = false;
+    public String message_id = null;
+    public String neededstars = "3";
+    public String prefix = "h.";
+    public String role_id = null;
+    public String starboard = null;
 
     public RethinkServer(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index eba7564..6bce94a 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -24,10 +24,10 @@ public class RethinkUser {
 
     private Rethink rethink;
 
-    String id;
-    String prefix = "h.";
-    String language = "en";
-    String blacklisted = null;
+    public String id;
+    public String prefix = "h.";
+    public String language = "en";
+    public String blacklisted = null;
 
     public RethinkUser(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {

From 0b4cc1e792936275d07a7e58282375180014cacb Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 08:26:36 +0100
Subject: [PATCH 20/48] Blacklist i18n

---
 .../commands/owner/BlacklistCommand.java      | 19 +++++++++----------
 .../Translations/Translations_en.properties   |  4 ++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index 5bd8f3e..55e86b2 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -21,7 +21,6 @@ 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.Member;
 import net.dv8tion.jda.api.entities.User;
 
 import java.util.ArrayList;
@@ -42,7 +41,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.addAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -50,9 +49,9 @@ public class BlacklistCommand implements Command {
                         String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none");
                         e.getRethinkUser().setBlacklisted(newblacklisted);
                         e.getTextChannel().sendMessage(
-                                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                        .setTitle("Removed Blacklisted Commands from User")
-                                        .setDescription("Blacklisted commands: "+newblacklisted)
+                                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                                        "commands.owner.blacklist.success.add.title", "",
+                                        "commands.owner.blacklist.success.add.description", newblacklisted)
                                         .build()).queue();
                         e.getRethinkUser().push();
                     }
@@ -62,7 +61,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.removeAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -70,9 +69,9 @@ public class BlacklistCommand implements Command {
                         String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none");
                         e.getRethinkUser().setBlacklisted(newblacklisted);
                         e.getTextChannel().sendMessage(
-                                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                        .setTitle("Removed Blacklisted Commands from User")
-                                        .setDescription("Blacklisted commands: "+newblacklisted)
+                                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                                        "commands.owner.blacklist.success.remove.title", "",
+                                        "commands.owner.blacklist.success.remove.description", newblacklisted)
                                         .build()).queue();
                         e.getRethinkUser().push();
                     }
@@ -83,7 +82,7 @@ public class BlacklistCommand implements Command {
                     for (User user : e.getJDA().getUsers()) {
                         if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
                             String blacklisted = e.getRethinkUser().getBlacklisted();
-                            if (!"none".equals(blacklisted)) {
+                            if (!(null == blacklisted)) {
                                 stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
                             }
                         }
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index bef41a8..d43d1de 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -299,6 +299,10 @@ commands.owner.shutdown.success.title = Shutdown
 commands.owner.shutdown.help.description = Shuts the Bot down
 commands.owner.test.success = TEST my friends
 commands.owner.test.help.description = Just a little Test Command
+commands.owner.blacklist.success.add.title = Successfully blacklisted the specified commands
+commands.owner.blacklist.success.add.description = I successfully added the following commands from the blacklist:\n %extra%
+commands.owner.blacklist.success.remove.title = Successfully removed the commands from the blacklist
+commands.owner.blacklist.success.remove.description = I successfully removed the following commands from the blacklist:\n %extra%
 commands.owner.blacklist.help.description = Blacklist a user for specific commands
 
 commands.settings.language.success.title = Language set

From cdff88174f021d2e61cf98333e695a56c3151725 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 08:30:59 +0100
Subject: [PATCH 21/48] Codacy stuff

---
 .../com/bbn/hadder/commands/owner/BlacklistCommand.java     | 6 +++---
 .../com/bbn/hadder/commands/settings/LanguageCommand.java   | 1 -
 src/main/java/com/bbn/hadder/core/CommandHandler.java       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index 55e86b2..70d596d 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -41,7 +41,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.addAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -61,7 +61,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (!(null == blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.removeAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -82,7 +82,7 @@ public class BlacklistCommand implements Command {
                     for (User user : e.getJDA().getUsers()) {
                         if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
                             String blacklisted = e.getRethinkUser().getBlacklisted();
-                            if (!(null == blacklisted)) {
+                            if (null != blacklisted) {
                                 stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
                             }
                         }
diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
index 9cece7a..67dd131 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
@@ -19,7 +19,6 @@ package com.bbn.hadder.commands.settings;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.EmbedBuilder;
 
 public class LanguageCommand implements Command {
 
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 99fe82a..78f2848 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -69,7 +69,7 @@ public class CommandHandler {
 
                     boolean run = true;
                     String blacklisted = rethinkUser.getBlacklisted();
-                    if (!(null == blacklisted)) {
+                    if (null != blacklisted) {
                         for (String BLLabel : blacklisted.split(",")) {
                             if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
                                 run = false;

From 464664891738728b4612f7945ab598fd710e2e80 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 15:44:33 +0100
Subject: [PATCH 22/48] Some builder stuff

---
 src/main/java/com/bbn/hadder/Hadder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index ca360af..c27bb07 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -31,6 +31,7 @@ import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 import net.dv8tion.jda.api.sharding.ShardManager;
+import net.dv8tion.jda.api.utils.ChunkingFilter;
 
 import java.util.List;
 
@@ -54,7 +55,9 @@ public class Hadder {
 
         builder.setAutoReconnect(true);
         builder.setShardsTotal(1);
-        builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
+        builder.setChunkingFilter(ChunkingFilter.ALL);
+        builder.setBulkDeleteSplittingEnabled(true);
+        builder.setActivity(Activity.listening("to h.help"));
         builder.setStatus(OnlineStatus.DO_NOT_DISTURB);
         builder.setToken(config.getBotToken());
 

From 92150583320b0c1ef4b8fc91b111350b28a94b30 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 15:44:50 +0100
Subject: [PATCH 23/48] Update version for next release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0d1a8ed..7b817a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
 
   <name>Hadder</name>
 

From 65ad656adbf24a59e5b5ab37a0579a0260a3621f Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 16:07:41 +0100
Subject: [PATCH 24/48] Introduce serverstats command

---
 src/main/java/com/bbn/hadder/Hadder.java      |  3 +-
 .../commands/misc/ServerStatsCommand.java     | 48 +++++++++++++++++++
 .../Translations/Translations_en.properties   |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index c27bb07..08d0a21 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -123,7 +123,8 @@ public class Hadder {
                         new PauseCommand(),
                         new LoopCommand(),
                         new BassCommand(),
-                        new EchoCommand()), config, helpCommand);
+                        new EchoCommand(),
+                        new ServerStatsCommand()), config, helpCommand);
 
         builder.addEventListeners(
                 new MentionListener(rethink),
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
new file mode 100644
index 0000000..278278c
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
+ *
+ * Licensed under the GNU Affero General Public License, Version 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.gnu.org/licenses/agpl-3.0.en.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.bbn.hadder.commands.misc;
+
+import com.bbn.hadder.commands.Command;
+import com.bbn.hadder.commands.CommandEvent;
+
+public class ServerStatsCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"serverstats"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.serverstats.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Server-ID]";
+    }
+
+    @Override
+    public String example() {
+        return "448554629282922527";
+    }
+}
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index d43d1de..054727a 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -87,6 +87,7 @@ commands.misc.screenshare.number.error.description = This isn't a Number.
 commands.misc.screenshare.channel.existing.error = Hol' up
 commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is in this Guild.
 commands.misc.screenshare.help.description = Shows you the link to share your screen.
+commands.misc.serverstats.help.description = Shows information about a server.
 
 commands.moderation.ban.success.title = Successfully banned
 commands.moderation.ban.success.description = I successfully baned %extra%

From c75c7dbcbb6c72a290a6a8e3bdbfe3391f0e4ae7 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 16:13:43 +0100
Subject: [PATCH 25/48] Help stuff

---
 .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index 278278c..f8af606 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -23,7 +23,11 @@ public class ServerStatsCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
+        if (args.length == 0) {
 
+        } else if (args.length == 1) {
+
+        } else e.getHelpCommand().sendHelp(this, e);
     }
 
     @Override

From 8367b1090f8c16f1fe5a2edb109d6d61fd84db1a Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Wed, 29 Jan 2020 16:34:30 +0100
Subject: [PATCH 26/48] TODO :eyes:

---
 src/main/java/com/bbn/hadder/listener/MentionListener.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index f7eae4e..1e637b5 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -66,6 +66,7 @@ public class MentionListener extends ListenerAdapter {
                 );
                 builder.addField("Dependencies", stringBuilder.toString(), false);
                 StringBuilder devs = new StringBuilder();
+                //TODO: Fix Mail stuff
                 model.getDevelopers().forEach(
                         developer -> devs.append(developer.getId()).append(" - [Website](").append(developer.getUrl()).append("), [E-Mail](https://hax.bigbotnetwork.de/redirect.html?url=mailto:").append(developer.getEmail()).append(")\n")
                 );

From 887a494509edaed54161cdf002e0dca5cc7b4560 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Thu, 30 Jan 2020 08:07:57 +0100
Subject: [PATCH 27/48] Real stats about a server

---
 .../hadder/commands/misc/ServerStatsCommand.java | 16 +++++++++-------
 .../Translations/Translations_en.properties      |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index f8af606..bad5c30 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -18,16 +18,18 @@ package com.bbn.hadder.commands.misc;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class ServerStatsCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
-        if (args.length == 0) {
-
-        } else if (args.length == 1) {
-
-        } else e.getHelpCommand().sendHelp(this, e);
+        e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                "commands.misc.serverstats.title", "",
+                "commands.misc.serverstats.description", e.getGuild().getName())
+                .addField("Owner", e.getGuild().getOwner().getUser().getAsTag(), false)
+                .addField("ID", e.getGuild().getId(), false)
+                .build()).queue();
     }
 
     @Override
@@ -42,11 +44,11 @@ public class ServerStatsCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Server-ID]";
+        return null;
     }
 
     @Override
     public String example() {
-        return "448554629282922527";
+        return null;
     }
 }
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index 054727a..aa667ef 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -87,6 +87,8 @@ commands.misc.screenshare.number.error.description = This isn't a Number.
 commands.misc.screenshare.channel.existing.error = Hol' up
 commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote\: Make sure the Voice Channel is in this Guild.
 commands.misc.screenshare.help.description = Shows you the link to share your screen.
+commands.misc.serverstats.title = Serverstats
+commands.misc.serverstats.description = This message contains some information about `%extra%`
 commands.misc.serverstats.help.description = Shows information about a server.
 
 commands.moderation.ban.success.title = Successfully banned

From c7fd92fbaf36e274664e74003ce6aa1b60ef147a Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Thu, 30 Jan 2020 08:39:12 +0100
Subject: [PATCH 28/48] There is a bug

---
 .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index bad5c30..c0896b9 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -29,6 +29,9 @@ public class ServerStatsCommand implements Command {
                 "commands.misc.serverstats.description", e.getGuild().getName())
                 .addField("Owner", e.getGuild().getOwner().getUser().getAsTag(), false)
                 .addField("ID", e.getGuild().getId(), false)
+                .addField("Region", e.getGuild().getRegion().getName(), false)
+                .setThumbnail(e.getGuild().getIconUrl())
+                .setImage(e.getGuild().getBannerUrl())
                 .build()).queue();
     }
 

From e16f97acc0706b8bf1b30da0190d51e3d1c9fcbc Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 13:09:19 +0100
Subject: [PATCH 29/48] #359

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b817a0..4535f77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
-  <packaging>pom</packaging>
   <version>1.0.1</version>
 
   <name>Hadder</name>

From a5c432157f1db885eb541c3adcc32f8b10df3226 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 13:32:17 +0100
Subject: [PATCH 30/48] Serverstats

---
 .../commands/misc/ServerStatsCommand.java     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index c0896b9..9c12a6c 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -19,20 +19,28 @@ package com.bbn.hadder.commands.misc;
 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 java.util.Date;
 
 public class ServerStatsCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
-        e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+        EmbedBuilder eb = e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
                 "commands.misc.serverstats.title", "",
                 "commands.misc.serverstats.description", e.getGuild().getName())
-                .addField("Owner", e.getGuild().getOwner().getUser().getAsTag(), false)
-                .addField("ID", e.getGuild().getId(), false)
-                .addField("Region", e.getGuild().getRegion().getName(), false)
+                .addField("Owner", e.getGuild().getOwner().getUser().getAsTag(), true)
+                .addField("ID", e.getGuild().getId(), true)
+                .addField("Region", e.getGuild().getRegion().getName(), true)
+                .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
                 .setThumbnail(e.getGuild().getIconUrl())
-                .setImage(e.getGuild().getBannerUrl())
-                .build()).queue();
+                .setImage(e.getGuild().getBannerUrl());
+
+        if (e.getGuild().getDescription() != null) eb.addField("Description", e.getGuild().getDescription(), true);
+        if (e.getGuild().getVanityCode() != null) eb.addField("Vanity Code", "[" + e.getGuild().getVanityCode() + "](https://discord.gg/" + e.getGuild().getVanityCode() + ")", true);
+
+        e.getTextChannel().sendMessage(eb.build()).queue();
     }
 
     @Override

From 81ef854db2fd147f2f4c3c3ce03a22953d674968 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 13:45:50 +0100
Subject: [PATCH 31/48] guildstats label

---
 .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index 9c12a6c..4110a7e 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -34,6 +34,8 @@ public class ServerStatsCommand implements Command {
                 .addField("ID", e.getGuild().getId(), true)
                 .addField("Region", e.getGuild().getRegion().getName(), true)
                 .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
+                .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true)
+                .addField("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`", true)
                 .setThumbnail(e.getGuild().getIconUrl())
                 .setImage(e.getGuild().getBannerUrl());
 
@@ -45,7 +47,7 @@ public class ServerStatsCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"serverstats"};
+        return new String[]{"serverstats", "guildstats"};
     }
 
     @Override

From 5cfc4857ecff529fbe3b190dd5e2e31e8b91861c Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 13:54:58 +0100
Subject: [PATCH 32/48] V level

---
 .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index 4110a7e..cc587d0 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -36,6 +36,7 @@ public class ServerStatsCommand implements Command {
                 .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
                 .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true)
                 .addField("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`", true)
+                .addField("Verification Level", e.getGuild().getVerificationLevel().getKey() + ": " +  e.getGuild().getVerificationLevel(), true)
                 .setThumbnail(e.getGuild().getIconUrl())
                 .setImage(e.getGuild().getBannerUrl());
 

From d3e9bdf2dcd187dd4a44843d2999afd2b0cacb50 Mon Sep 17 00:00:00 2001
From: Hax <arzberger52@gmail.com>
Date: Sat, 1 Feb 2020 14:07:12 +0100
Subject: [PATCH 33/48] OK GUYS I PUSHED

---
 src/main/java/com/bbn/hadder/Hadder.java      |  3 +-
 .../hadder/commands/misc/ProfileCommand.java  | 80 +++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index 08d0a21..8db6557 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -124,7 +124,8 @@ public class Hadder {
                         new LoopCommand(),
                         new BassCommand(),
                         new EchoCommand(),
-                        new ServerStatsCommand()), config, helpCommand);
+                        new ServerStatsCommand(),
+                        new ProfileCommand()), config, helpCommand);
 
         builder.addEventListeners(
                 new MentionListener(rethink),
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
new file mode 100644
index 0000000..784ef19
--- /dev/null
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -0,0 +1,80 @@
+/*
+ * @author Hax / Hax6775 / Schlauer_Hax
+ */
+
+package com.bbn.hadder.commands.misc;
+
+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.Member;
+import net.dv8tion.jda.api.entities.User;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.format.DateTimeFormatter;
+
+public class ProfileCommand implements Command {
+
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        Member member = null;
+        if (args.length == 0) {
+            member = e.getMember();
+        } else if (StringUtils.isNumeric(args[0])) {
+            member = e.getGuild().getMemberById(args[0]);
+        } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) {
+            try {
+                member = e.getGuild().getMemberByTag(args[0]);
+            } catch (IllegalArgumentException ex) {
+                // TODO: Translate and give better message
+                e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+            }
+        } else if (e.getMessage().getMentionedMembers().size() == 1) {
+            member = e.getMessage().getMentionedMembers().get(0);
+        }
+        try {
+            member.getUser();
+            // TODO: Translate
+            EmbedBuilder embed = e.getMessageEditor()
+                    .getMessage(MessageEditor.MessageType.INFO)
+                    .setTitle("User Information")
+                    .addField("Username", member.getUser().getName(), true)
+                    .addField("Usertag", member.getUser().getAsTag(), true)
+                    .addField("Userid", member.getUser().getId(), true)
+                    .addField("Account Creation Date", member.getUser().getTimeCreated()
+                            .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
+                    .addField("Name on Guild", member.getEffectiveName(), true)
+                    .addField("Guild Join Date", member.getTimeJoined()
+                            .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
+                    .addField("Roles", String.valueOf(member.getRoles().size()), true);
+
+            e.getChannel().sendMessage(embed.build()).queue();
+        } catch (NullPointerException ex) {
+            // TODO: Translate and give better message
+            e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+        }
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"profile", "user"};
+    }
+
+    @Override
+    public String description() {
+        return "Shows some information about the user.";
+    }
+
+    @Override
+    public String usage() {
+        return "@User|UserID|Username";
+    }
+
+    @Override
+    public String example() {
+        return "Hax#6775";
+    }
+}

From 003aa8b3d7bf1f8c8a4575b8fb4788f5c8300f2c Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 14:45:23 +0100
Subject: [PATCH 34/48] Add stuff

---
 .../java/com/bbn/hadder/commands/misc/ServerStatsCommand.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index cc587d0..2f6be53 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -35,8 +35,9 @@ public class ServerStatsCommand implements Command {
                 .addField("Region", e.getGuild().getRegion().getName(), true)
                 .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
                 .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true)
-                .addField("Text/Voice Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`", true)
+                .addField("Text/Voice/Store Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`" + "/" + "`" + e.getGuild().getStoreChannels().size() + "`", true)
                 .addField("Verification Level", e.getGuild().getVerificationLevel().getKey() + ": " +  e.getGuild().getVerificationLevel(), true)
+                .addField("MFA Level", String.valueOf(e.getGuild().getRequiredMFALevel().getKey()), true)
                 .setThumbnail(e.getGuild().getIconUrl())
                 .setImage(e.getGuild().getBannerUrl());
 

From 748fd7c1b2edadbbe551f80e9ea55fe8bd45a439 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 16:40:49 +0100
Subject: [PATCH 35/48] More serverstats :^)

---
 .../com/bbn/hadder/commands/misc/ServerStatsCommand.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
index 2f6be53..788701c 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ServerStatsCommand.java
@@ -35,9 +35,14 @@ public class ServerStatsCommand implements Command {
                 .addField("Region", e.getGuild().getRegion().getName(), true)
                 .addField("Time created", new Date(e.getGuild().getTimeCreated().toInstant().toEpochMilli()).toString(), true)
                 .addField("Roles", String.valueOf(e.getGuild().getRoles().size()), true)
+                .addField("Emotes", String.valueOf(e.getGuild().getEmotes().size()), true)
+                .addField("Categories", String.valueOf(e.getGuild().getCategories().size()), true)
                 .addField("Text/Voice/Store Channels", "`" + e.getGuild().getTextChannels().size() + "`" + "/" + "`" + e.getGuild().getVoiceChannels().size() + "`" + "/" + "`" + e.getGuild().getStoreChannels().size() + "`", true)
                 .addField("Verification Level", e.getGuild().getVerificationLevel().getKey() + ": " +  e.getGuild().getVerificationLevel(), true)
                 .addField("MFA Level", String.valueOf(e.getGuild().getRequiredMFALevel().getKey()), true)
+                .addField("Member Count", String.valueOf(e.getGuild().getMemberCount()), true)
+                .addField("Explicit Content Level", e.getGuild().getExplicitContentLevel().getKey() + ": " + e.getGuild().getExplicitContentLevel(), true)
+                //TODO: Features
                 .setThumbnail(e.getGuild().getIconUrl())
                 .setImage(e.getGuild().getBannerUrl());
 

From 6cb0929f41a812b4ee52322e05563676b7d6e55a Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 21:20:00 +0100
Subject: [PATCH 36/48] Unused

---
 src/main/java/com/bbn/hadder/RethinkUser.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index 6bce94a..760e79d 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -43,18 +43,10 @@ public class RethinkUser {
         this.rethink = rethink;
     }
 
-    public RethinkUser(String id) {
-        this.id = id;
-    }
-
     public Rethink getRethink() {
         return rethink;
     }
 
-    public void setRethink(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
     public String getId() {
         return id;
     }

From 60187df58c64bb075bb1cd525342517bd685ad55 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 22:03:44 +0100
Subject: [PATCH 37/48] Codacy yk

---
 src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index 784ef19..02aa6cd 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -9,7 +9,6 @@ import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.User;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.format.DateTimeFormatter;

From d4064b395cbefaf77a9dde2e7fff961a1cbcc2dd Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 22:30:02 +0100
Subject: [PATCH 38/48] .

---
 .../java/com/bbn/hadder/commands/misc/ProfileCommand.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index 02aa6cd..3862cdd 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -15,13 +15,12 @@ import java.time.format.DateTimeFormatter;
 
 public class ProfileCommand implements Command {
 
-
     @Override
     public void executed(String[] args, CommandEvent e) {
         Member member = null;
         if (args.length == 0) {
             member = e.getMember();
-        } else if (StringUtils.isNumeric(args[0])) {
+        } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
             member = e.getGuild().getMemberById(args[0]);
         } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) {
             try {
@@ -59,7 +58,7 @@ public class ProfileCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"profile", "user"};
+        return new String[]{"profile", "user", "userinfo"};
     }
 
     @Override

From 2d9fb1e1e4428f01dc04c433cd44e99b7d9d7d14 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sat, 1 Feb 2020 22:37:49 +0100
Subject: [PATCH 39/48] Better help

---
 src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java  | 2 +-
 src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java   | 2 +-
 src/main/java/com/bbn/hadder/commands/fun/GifCommand.java     | 4 ++--
 .../java/com/bbn/hadder/commands/general/HelpCommand.java     | 2 +-
 src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java | 2 +-
 .../java/com/bbn/hadder/commands/misc/ProfileCommand.java     | 2 +-
 .../java/com/bbn/hadder/commands/misc/ScreenShareCommand.java | 4 ++--
 .../java/com/bbn/hadder/commands/moderation/BanCommand.java   | 2 +-
 .../java/com/bbn/hadder/commands/moderation/ClearCommand.java | 2 +-
 .../java/com/bbn/hadder/commands/moderation/KickCommand.java  | 2 +-
 .../java/com/bbn/hadder/commands/moderation/NickCommand.java  | 2 +-
 .../com/bbn/hadder/commands/moderation/PrefixCommand.java     | 2 +-
 .../bbn/hadder/commands/moderation/RegionChangeCommand.java   | 2 +-
 .../java/com/bbn/hadder/commands/moderation/RoleCommand.java  | 2 +-
 .../com/bbn/hadder/commands/moderation/StarboardCommand.java  | 2 +-
 src/main/java/com/bbn/hadder/commands/music/BassCommand.java  | 2 +-
 src/main/java/com/bbn/hadder/commands/music/PlayCommand.java  | 2 +-
 .../java/com/bbn/hadder/commands/music/VolumeCommand.java     | 2 +-
 .../java/com/bbn/hadder/commands/owner/BlacklistCommand.java  | 2 +-
 src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java  | 2 +-
 .../java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java | 2 +-
 .../com/bbn/hadder/commands/settings/LanguageCommand.java     | 2 +-
 .../com/bbn/hadder/commands/settings/UserPrefixCommand.java   | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
index ffc9c76..d40f71e 100644
--- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java
@@ -111,7 +111,7 @@ public class AvatarCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User]";
+        return "[user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
index e456876..29e01e4 100644
--- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
@@ -85,7 +85,7 @@ public class ClydeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Content]";
+        return "[content]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
index 22e4e14..239e681 100644
--- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
@@ -70,11 +70,11 @@ public class GifCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Term]";
+        return "[term]";
     }
 
     @Override
     public String example() {
-        return "Cute cat";
+        return "cute cat";
     }
 }
diff --git a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
index 533e688..d643576 100644
--- a/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/general/HelpCommand.java
@@ -104,7 +104,7 @@ public class HelpCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Command name]";
+        return "[command]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
index 343bc5c..606c9bb 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
@@ -117,7 +117,7 @@ public class GitHubCommand implements Command {
 
     @Override
     public String usage() {
-        return "[GH name]";
+        return "[user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index 3862cdd..6a3a451 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -68,7 +68,7 @@ public class ProfileCommand implements Command {
 
     @Override
     public String usage() {
-        return "@User|UserID|Username";
+        return "[user/id]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
index e8bb036..30265d7 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java
@@ -91,11 +91,11 @@ public class ScreenShareCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Channel]";
+        return "[channel]";
     }
 
     @Override
     public String example() {
-        return "Gaming-Lounge";
+        return "Talk";
     }
 }
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
index cb62cec..6fd6bb2 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/BanCommand.java
@@ -104,7 +104,7 @@ public class BanCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)]";
+        return "[user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
index 290a6af..9f6fc14 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
@@ -109,7 +109,7 @@ public class ClearCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Amount]";
+        return "[amount]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
index 87db3de..990042f 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
@@ -89,7 +89,7 @@ public class KickCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)]";
+        return "[user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
index 2f838f7..1849238 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java
@@ -117,7 +117,7 @@ public class NickCommand implements Command {
 
     @Override
     public String usage() {
-        return "[User(s)] [New nickname]";
+        return "[user] [nickname]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
index 7d2293e..a6db1db 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/PrefixCommand.java
@@ -62,7 +62,7 @@ public class PrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New Prefix]";
+        return "[new prefix]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
index 51a9e3d..59c7a0d 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
@@ -134,7 +134,7 @@ public class RegionChangeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New region]";
+        return "[new region]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
index 3d774d7..3799f7f 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RoleCommand.java
@@ -112,7 +112,7 @@ public class RoleCommand implements Command {
 
     @Override
     public String usage() {
-        return "[add/remove] [Role>] [User]";
+        return "[add/remove] [role] [user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
index 2c497e3..59bdb7b 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/StarboardCommand.java
@@ -63,7 +63,7 @@ public class StarboardCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Channel] [Needed stars]";
+        return "[channel] [needed stars]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java
index 2df554a..61facab 100644
--- a/src/main/java/com/bbn/hadder/commands/music/BassCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/BassCommand.java
@@ -63,7 +63,7 @@ public class BassCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Bass-Level]";
+        return "[bass level]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
index 794c960..45c3855 100644
--- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
@@ -83,7 +83,7 @@ public class PlayCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Song URL/Name]";
+        return "[URL/name]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
index 994224b..fc7be0b 100644
--- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
@@ -68,7 +68,7 @@ public class VolumeCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New volume]";
+        return "[volume]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index 70d596d..daf809a 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -113,7 +113,7 @@ public class BlacklistCommand implements Command {
 
     @Override
     public String usage() {
-        return "add|remove|list command @User";
+        return "[add|remove|list] [command] [user]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
index 146d4a6..5b5f512 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
@@ -114,7 +114,7 @@ public class EvalCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Code]";
+        return "[code]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
index feb16ae..15bc1a9 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
@@ -58,7 +58,7 @@ public class GuildLeaveCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Guild-ID]";
+        return "[id]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
index 67dd131..e09a44a 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
@@ -82,7 +82,7 @@ public class LanguageCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Language code]";
+        return "[language code]";
     }
 
     @Override
diff --git a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
index b83da2c..4b17d3f 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/UserPrefixCommand.java
@@ -49,7 +49,7 @@ public class UserPrefixCommand implements Command {
 
     @Override
     public String usage() {
-        return "[New Prefix]";
+        return "[new prefix]";
     }
 
     @Override

From 93598e51ead92e9cc8095f2aa685b40472180c1d Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 02:24:24 +0100
Subject: [PATCH 40/48] yk stuff yk

---
 .../java/com/bbn/hadder/commands/music/VolumeCommand.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
index fc7be0b..dec010d 100644
--- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java
@@ -19,6 +19,7 @@ package com.bbn.hadder.commands.music;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
+import org.jsoup.internal.StringUtil;
 
 public class VolumeCommand implements Command {
 
@@ -27,7 +28,7 @@ public class VolumeCommand implements Command {
         if (args.length > 0) {
             if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) {
                 if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                    try {
+                    if (StringUtil.isNumeric(args[0])) {
                         int volume = Integer.parseInt(args[0]);
                         if (volume < 201 && volume > 0 || e.getConfig().getOwners().contains(e.getAuthor().getIdLong())) {
                             e.getAudioManager().getPlayer(e.getGuild()).setVolume(volume);
@@ -39,9 +40,7 @@ public class VolumeCommand implements Command {
                                     "commands.music.volume.error.int.title",
                                     "commands.music.volume.error.int.description").build()).queue();
                         }
-                    } catch (NumberFormatException ex) {
-                        e.getHelpCommand().sendHelp(this, e);
-                    }
+                    } else e.getHelpCommand().sendHelp(this, e);
                 } else {
                     e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
                             "commands.music.volume.error.connected.title",

From 11b0c7879a0f778cc2230d8141a24f3816cc573c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 2 Feb 2020 11:21:16 +0000
Subject: [PATCH 41/48] Bump JDA from 4.1.1_104 to 4.1.1_105

Bumps JDA from 4.1.1_104 to 4.1.1_105.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4535f77..87e9493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_104</version>
+      <version>4.1.1_105</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>

From c0132ecb2179d4e92b0e61b75280efa1b7b0bd8d Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 15:46:00 +0100
Subject: [PATCH 42/48] Profile Command

---
 .../hadder/commands/misc/ProfileCommand.java  | 43 ++++++++++---------
 .../Translations/Translations_en.properties   |  3 ++
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index 6a3a451..bcfa3fe 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -9,6 +9,7 @@ import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
 import org.apache.commons.lang3.StringUtils;
 
 import java.time.format.DateTimeFormatter;
@@ -17,41 +18,43 @@ public class ProfileCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
-        Member member = null;
+        User u = null;
         if (args.length == 0) {
-            member = e.getMember();
+            u = e.getAuthor();
         } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
-            member = e.getGuild().getMemberById(args[0]);
+            u = e.getJDA().getUserById(args[0]);
         } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) {
             try {
-                member = e.getGuild().getMemberByTag(args[0]);
-            } catch (IllegalArgumentException ex) {
-                // TODO: Translate and give better message
-                e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+                u = e.getJDA().getUserByTag(args[0]);
+            } catch (Exception ex) {
+                e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.profile.error.title",
+                        "commands.misc.profile.error.description").build()).queue();
+                return;
             }
-        } else if (e.getMessage().getMentionedMembers().size() == 1) {
-            member = e.getMessage().getMentionedMembers().get(0);
+        } else if (e.getMessage().getMentionedUsers().size() == 1) {
+            u = e.getMessage().getMentionedUsers().get(0);
         }
         try {
-            member.getUser();
             // TODO: Translate
             EmbedBuilder embed = e.getMessageEditor()
                     .getMessage(MessageEditor.MessageType.INFO)
                     .setTitle("User Information")
-                    .addField("Username", member.getUser().getName(), true)
-                    .addField("Usertag", member.getUser().getAsTag(), true)
-                    .addField("Userid", member.getUser().getId(), true)
-                    .addField("Account Creation Date", member.getUser().getTimeCreated()
+                    .addField("Username", u.getName(), true)
+                    .addField("Tag", u.getAsTag(), true)
+                    .addField("ID", u.getId(), true)
+                    .addField("Account Creation Date", u.getTimeCreated()
                             .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
-                    .addField("Name on Guild", member.getEffectiveName(), true)
-                    .addField("Guild Join Date", member.getTimeJoined()
+                    .addField("Nickname", e.getGuild().getMember(u).getEffectiveName(), true)
+                    .addField("Guild Join Date", e.getGuild().getMember(u).getTimeJoined()
                             .format(DateTimeFormatter.ISO_DATE_TIME).replace("T", " ").replace("Z", ""), true)
-                    .addField("Roles", String.valueOf(member.getRoles().size()), true);
+                    .addField("Roles", String.valueOf(e.getGuild().getMember(u).getRoles().size()), true);
 
             e.getChannel().sendMessage(embed.build()).queue();
         } catch (NullPointerException ex) {
-            // TODO: Translate and give better message
-            e.getChannel().sendMessage("Stop it. Just give me some valid user").queue();
+            e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.misc.profile.error.title",
+                    "commands.misc.profile.error.description").build()).queue();
         }
 
     }
@@ -63,7 +66,7 @@ public class ProfileCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows some information about the user.";
+        return "commands.misc.profile.help.description";
     }
 
     @Override
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index aa667ef..d638b91 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -90,6 +90,9 @@ commands.misc.screenshare.help.description = Shows you the link to share your sc
 commands.misc.serverstats.title = Serverstats
 commands.misc.serverstats.description = This message contains some information about `%extra%`
 commands.misc.serverstats.help.description = Shows information about a server.
+commands.misc.profile.error.title = Not found
+commands.misc.profile.error.description = I can't find the specified user.
+commands.misc.profile.help.description = Shows some information about the specified user.
 
 commands.moderation.ban.success.title = Successfully banned
 commands.moderation.ban.success.description = I successfully baned %extra%

From e95dc393276a1b378dc65cfa9d71c95ca07ed5ea Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 15:48:31 +0100
Subject: [PATCH 43/48] Unused import

---
 src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index bcfa3fe..a2b0972 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -8,7 +8,6 @@ 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.Member;
 import net.dv8tion.jda.api.entities.User;
 import org.apache.commons.lang3.StringUtils;
 

From af3b5553e3747d78d81b786713545a72aa2869e6 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 15:51:17 +0100
Subject: [PATCH 44/48] Copyright...

---
 .../bbn/hadder/commands/misc/ProfileCommand.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
index a2b0972..87d1901 100644
--- a/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/misc/ProfileCommand.java
@@ -1,5 +1,17 @@
 /*
- * @author Hax / Hax6775 / Schlauer_Hax
+ * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
+ *
+ * Licensed under the GNU Affero General Public License, Version 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.gnu.org/licenses/agpl-3.0.en.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.bbn.hadder.commands.misc;

From 80a4137dca81bb15e6c856ce74209f8ac2ba3ba9 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 15:53:09 +0100
Subject: [PATCH 45/48] Codacy again

---
 src/main/java/com/bbn/hadder/audio/AudioManager.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java
index 05ae700..fe45e59 100644
--- a/src/main/java/com/bbn/hadder/audio/AudioManager.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java
@@ -18,16 +18,12 @@ package com.bbn.hadder.audio;
 
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
-import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.player.*;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 
 import java.util.AbstractMap;

From 07edce3df37c22fbcee2a74920a5452fe7cb7940 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 16:05:25 +0100
Subject: [PATCH 46/48] Revert "null"

This reverts commit 07b8749e0b6fd514dfad22e86ba4461b416da0b5.
---
 src/main/java/com/bbn/hadder/Rethink.java      | 16 +++++-----------
 .../java/com/bbn/hadder/RethinkServer.java     | 18 +++++++++---------
 src/main/java/com/bbn/hadder/RethinkUser.java  |  8 ++++----
 .../com/bbn/hadder/core/CommandHandler.java    |  2 +-
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index 2a14fac..6b2b137 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -18,7 +18,6 @@ package com.bbn.hadder;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
-import com.rethinkdb.gen.exc.ReqlNonExistenceError;
 import com.rethinkdb.gen.exc.ReqlOpFailedError;
 import com.rethinkdb.net.Connection;
 import org.json.JSONArray;
@@ -126,10 +125,10 @@ public class Rethink {
         this.insert("server", r
                 .hashMap("id", id)
                 .with("prefix", "h.")
-                .with("message_id", null)
-                .with("role_id", null)
+                .with("message_id", "")
+                .with("role_id", "")
                 .with("invite_detect", false)
-                .with("starboard", null)
+                .with("starboard", "")
                 .with("neededstars", "4")
         );
     }
@@ -144,7 +143,7 @@ public class Rethink {
 
     // TODO
     public boolean hasStarboardChannel(String guild_id) {
-        return this.getByID("server", guild_id, "starboard") != null;
+        return !this.getByID("server", guild_id, "starboard").equals("");
     }
     // TODO
     public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {
@@ -160,12 +159,7 @@ public class Rethink {
     }
     // TODO
     public boolean hasStarboardMessage(String message_id) {
-        try {
-            this.getByID("stars", message_id, "guild");
-            return true;
-        } catch (ReqlNonExistenceError e) {
-            return false;
-        }
+        return this.getByID("stars", message_id, "guild") != null;
     }
 
 
diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java
index ee88da6..c15c448 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/RethinkServer.java
@@ -24,15 +24,15 @@ public class RethinkServer {
 
     private Rethink rethink;
 
-    public String accept_emote = null;
-    public String decline_emote = null;
-    public String id;
-    public boolean invite_detect = false;
-    public String message_id = null;
-    public String neededstars = "3";
-    public String prefix = "h.";
-    public String role_id = null;
-    public String starboard = null;
+    String accept_emote = "";
+    String decline_emote = "";
+    String id;
+    boolean invite_detect = false;
+    String message_id = "";
+    String neededstars = "3";
+    String prefix = "h.";
+    String role_id = "";
+    String starboard = "";
 
     public RethinkServer(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index 760e79d..1d99ac5 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -24,10 +24,10 @@ public class RethinkUser {
 
     private Rethink rethink;
 
-    public String id;
-    public String prefix = "h.";
-    public String language = "en";
-    public String blacklisted = null;
+    String id;
+    String prefix = "h.";
+    String language = "en";
+    String blacklisted = "none";
 
     public RethinkUser(JSONObject object, Rethink rethink) {
         for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 78f2848..5f2029c 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -69,7 +69,7 @@ public class CommandHandler {
 
                     boolean run = true;
                     String blacklisted = rethinkUser.getBlacklisted();
-                    if (null != blacklisted) {
+                    if (!"none".equals(blacklisted)) {
                         for (String BLLabel : blacklisted.split(",")) {
                             if (Arrays.asList(cmd.labels()).contains(BLLabel)) {
                                 run = false;

From 9a9eb334f0d05bf023267573e930ef7cb865e40a Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 2 Feb 2020 16:10:02 +0100
Subject: [PATCH 47/48] Revert null in the blc

---
 .../com/bbn/hadder/commands/owner/BlacklistCommand.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index daf809a..54298c6 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -41,7 +41,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.addAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -61,7 +61,7 @@ public class BlacklistCommand implements Command {
                     if (args.length == 3) {
                         String blacklisted = e.getRethinkUser().getBlacklisted();
                         List<String> commands = new ArrayList<>();
-                        if (null != blacklisted) commands.addAll(Arrays.asList(blacklisted.split(",")));
+                        if (!"none".equals(blacklisted)) commands.addAll(Arrays.asList(blacklisted.split(",")));
                         commands.removeAll(Arrays.asList(args[1].split(",")));
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
@@ -82,7 +82,7 @@ public class BlacklistCommand implements Command {
                     for (User user : e.getJDA().getUsers()) {
                         if (!user.getId().equals(e.getJDA().getSelfUser().getId())) {
                             String blacklisted = e.getRethinkUser().getBlacklisted();
-                            if (null != blacklisted) {
+                            if (!"none".equals(blacklisted)) {
                                 stringBuilder.append(user.getAsTag()).append(" (").append(user.getId()).append(") - ").append(blacklisted).append("\n");
                             }
                         }

From b6a543b0a76b950f25ce3980ae44ab3e7be40bac Mon Sep 17 00:00:00 2001
From: Hax <arzberger52@gmail.com>
Date: Sun, 2 Feb 2020 17:48:57 +0100
Subject: [PATCH 48/48] DATABASE FIX

---
 src/main/java/com/bbn/hadder/Rethink.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java
index 6b2b137..a714fd2 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/Rethink.java
@@ -174,7 +174,7 @@ public class Rethink {
                 }
             }
         }
-        r.table("server").get(server.getId()).update(object).run(conn);
+        r.table("server").get(server.getId()).update(object.toMap()).run(conn);
     }
 
     public void pushUser(RethinkUser user) {
@@ -188,7 +188,7 @@ public class Rethink {
                 }
             }
         }
-        r.table("user").get(user.getId()).update(object).run(conn);
+        r.table("user").get(user.getId()).update(object.toMap()).run(conn);
     }
 
 }