Merge pull request #734 from BBN-Holding/greg-dev

Merge pull request #733 from BBN-Holding/master

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: BBN Holding Discord Support
+    url: https://discord.gg/nPwjaJk
+    about: Please ask questions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,28 @@
+---
+name: "💡 Feature request"
+about: Submit your idea for a change in the codebase.
+---
+
+# Feature request
+
+<!--
+This issue should serve for you to present or pitch an idea to the maintainers - but remember that it would be better if you were to submit a PR instead 🤗
+-->
+
+## Why it is needed
+
+<!--
+Please tell us a bit more of why you want this feature to be added, what's its origin.
+-->
+
+## Possible implementation
+
+<!--
+It really helps if you could describe from a technical POV how this new feature would work, which code it rely on, etc.
+-->
+
+### Code sample
+
+<!--
+Please show how the new code could work, if doable.
+-->

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "13:00"
+  open-pull-requests-limit: 99
+  target-branch: greg-dev
+  assignees:
+  - GregTCLTK
+  labels:
+  - pending-deploy

.github/workflows/maven.yml

@@ -3,35 +3,36 @@ name: Hadder
 on: [push]
 
 jobs:
-    build:
+  build:
-      runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-      steps:
+    steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK 1.13
+      - name: Set up JDK 15
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v1.4.3
         with:
-          java-version: 1.13
+          java-version: '15'
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 
-    deploy:
+  deploy:
-      runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-      needs: build
+    needs: build
-      if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master'
-      steps:
+    steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
-      - name: Set up JDK 1.13
+      - name: Set up JDK 15
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v1.4.3
         with:
-          java-version: 1.13
+          java-version: '15'
       - name: Build Final Jar
         run:  mvn clean compile assembly:single
       - name: Copy folder content recursively to remote
         uses: garygrossgarten/github-action-scp@release
         with:
           local: ./target/Hadder-Build.jar
-          remote: /home/Bots/Hadder-Build.jar
+          remote: /root/bots/Hadder/Hadder-Build.jar
           host: ${{ secrets.HOST }}
+          port: ${{ secrets.PORT }}
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
       - name: executing remote ssh commands using password
@@ -41,7 +42,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           port: ${{ secrets.PORT }}
-          script: /home/Bots/deploy.sh
+          script: /root/bots/Hadder/deploy.sh
       - name: Send Webhook Notification
         if: always()
         env:

CODE_OF_CONDUCT.md

@@ -57,7 +57,7 @@ If a community member engages in unacceptable behavior, the community organizers
 
 ## 7. Reporting Guidelines
 
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bigbotnetwork.com.
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. admin@bbn.one.
 
 
 
@@ -65,7 +65,7 @@ Additionally, community organizers are available to help community members engag
 
 ## 8. Addressing Grievances
 
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BigBotNetwork with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. 
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify BBN with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. 
 
 
 
@@ -77,7 +77,7 @@ This code of conduct and its related procedures also applies to unacceptable beh
 
 ## 10. Contact info
 
-admin@bigbotnetwork.com
+admin@bbn.one
 
 ## 11. License and attribution
 

CONTRIBUTING.md

@@ -69,7 +69,7 @@ further defined and clarified by project maintainers.
 ### Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team on [Discord](https://discordapp.com/invite/Vf4zCYn). All
+reported by contacting the project team on [Discord](https://discordapp.com/invite/nPwjaJk). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

Dockerfile

@@ -0,0 +1,2 @@
+FROM debian:buster
+WORKDIR /home/Hadder

README.md

@@ -1,23 +1,61 @@
-# Hadder
+# Hadder
-
+
-Hadder Discord is a multi-purpose Discord bot with 100% uptime.
+Hadder Discord is a multi-purpose Discord bot with 100% uptime.
-
+
-<a href="https://discord.gg/58My2dM"><img src="https://discordapp.com/api/guilds/448554629282922527/embed.png"/></a>
+<a href="https://discord.gg/nPwjaJk"><img src="https://discord.com/api/guilds/757966278936756345/embed.png"/></a>
-[![Build Status](https://github.com/BigBotNetwork/Hadder/workflows/Hadder/badge.svg)](https://github.com/BigBotNetwork/Hadder)
+[![Build Status](https://github.com/BBN-Holding/Hadder/workflows/Hadder/badge.svg)](https://github.com/BBN-Holding/Hadder)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BigBotNetwork/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BigBotNetwork/Hadder&amp;utm_campaign=Badge_Grade)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ddb8cb7ec85f467caa691c175e1f01b5)](https://www.codacy.com/gh/BBN-Holding/Hadder?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=BBN-Holding/Hadder&amp;utm_campaign=Badge_Grade)
-[![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder)
+[![CodeFactor](https://www.codefactor.io/repository/github/bigbotnetwork/hadder/badge)](https://www.codefactor.io/repository/github/bigbotnetwork/hadder)
-[![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
+[![Crowdin](https://badges.crowdin.net/e/bc0babde730eb3eada34778502a31b03/localized.svg)](https://bbn.crowdin.com/hadder)
-[![GitHub issues](https://img.shields.io/github/issues/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/issues)
+[![GitHub issues](https://img.shields.io/github/issues/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/issues)
-[![GitHub license](https://img.shields.io/github/license/BigBotNetwork/Hadder)](https://github.com/BigBotNetwork/Hadder/blob/master/LICENSE)
+[![GitHub license](https://img.shields.io/github/license/BBN-Holding/Hadder)](https://github.com/BBN-Holding/Hadder/blob/master/LICENSE)
-
+[![time tracker](https://wakatime.com/badge/github/BBN-Holding/Hadder.svg)](https://wakatime.com/badge/github/BBN-Holding/Hadder)
-[![Discord Extreme List](https://api.discordextremelist.xyz/v1/bot/637002314162372639/widget)](https://discordextremelist.xyz/bots/Hadder)
+
-[![Discord Bots](https://top.gg/api/widget/637002314162372639.svg)](https://top.gg/bot/637002314162372639)
+## Hadder Team
-[![Hadder's Widget](https://api.botlist.space/widget/637002314162372639/2 "Hadder's Widget")](https://botlist.space/bot/637002314162372639?utm_source=bls&utm_medium=widget&utm_campaign=637002314162372639)
+### Developer
-
+Skidder#6775 <br>
-## Hadder Team
+Hax#6775
-### Developer
+
-Skidder#6775 <br>
+## A few commands
-Hax#6775
+| **Command**    | **Description**                                               |
-
+|----------------|---------------------------------------------------------------|
-### Designer
+| h.about        | Shows information about Hadder                                |
-TopComp#1288
+| h.avatar       | Sends the avatar of the specified Member                      |
+| h.ban          | Bans one or more users from the server                        |
+| h.bass         | Change the bass for the song which is played at the moment    |
+| h.clear        | Deletes the specified number of messages                      |
+| h.clyde        | Sends a message as a webhook named Clyde                      |
+| h.code         | Shows information about a invite code                         |
+| h.corona       | Shows the newest stats of COVID-19                            |
+| h.echo         | Sends your voice through Hadder                               |
+| h.editrules    | Edits the rules message                                       |
+| h.equals       | Checks if two strings are equal                               |
+| h.feedback     | Sends feedback directly to the developers                     |
+| h.gif          | Looks for a GIF on Giphy                                      |
+| h.github       | Displays information about a GitHub user profile              |
+| h.help         | Shows each command and explains its usage                     |
+| h.info         | Shows information about the playing song                      |
+| h.invite       | Shows the invitation link to invite Hadder to your server     |
+| h.invitedetect | Activate or deactivate the Discord invite link detection      |
+| h.join         | Joins your voice channel                                      |
+| h.kick         | Kicks one or more user from the server                        |
+| h.language     | Sets the new primary language for a user                      |
+| h.loop         | Repeats a song/queue                                          |
+| h.meme         | Sends you a random meme                                       |
+| h.moveall      | Moves all users in the source channel to the target channel   |
+| h.nick         | Rename a one or more user                                     |
+| h.pause        | Pause the playing song                                        |
+| h.ping         | Shows the ping to the Discord API                             |
+| h.play         | Plays the specified song                                      |
+| h.prefix       | Sets the Guild-Prefix                                         |
+| h.profile      | Shows some information about the specified user               |
+| h.queue        | Shows the music queue                                         |
+| h.regionchange | Changes the server region to locked regions                   |
+| h.role         | Adds and removes one or more role(s) from one or more user(s) |
+| h.rules        | Setup the rules on your Discord server                        |
+| h.screenshare  | Shows you the link to share your screen                       |
+| h.serverstats  | Shows information about a server                              |
+| h.skip         | Skips the currently playing song                              |
+| h.starboard    | Sets the starboard channel                                    |
+| h.stop         | Stops the song                                                |
+| h.volume       | Change the volume of the music                                |

crowdin.yml

@@ -1,4 +1,4 @@
-base_url: 'https://bigbotnetwork.com'
+base_url: 'https://bbn.one'
 commit_message: 'New %language% translation'
 files:
   - source: /src/main/resources/Translations/Translations_en.properties

example-config.json

@@ -1,25 +1,17 @@
 {
-  "Owners":
+  "Owners": [
-  [],
+  ],
-  "Database":{"IP":"",
+  "Database": {
+    "IP": "",
     "Port": 6775,
     "DBName": "",
     "Username": "",
-    "Password": ""},
+    "Password": ""
+  },
   "Tokens": {
     "BotToken": "",
     "Giphy": "",
-    "GitHub": "",
+    "GitHub": ""
-    "MythicalBotList": "",
-    "BotsForDiscord": "",
-    "DiscordBotList": "",
-    "DiscordBestBots": "",
-    "DiscordBoats": "",
-    "YetAnotherBotList": "",
-    "DiscordExtremeList": "",
-    "DiscordBotReviews": "",
-    "DiscordBots": "",
-    "BotListSpace": ""
   },
   "Clyde": ""
 }

pom.xml

@@ -1,136 +1,138 @@
 <?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  <modelVersion>4.0.0</modelVersion>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <groupId>Hadder</groupId>
+    <modelVersion>4.0.0</modelVersion>
-  <artifactId>Hadder</artifactId>
+    <groupId>Hadder</groupId>
-  <version>0.1-BETA</version>
+    <artifactId>Hadder</artifactId>
+    <version>2.0.4</version>
+    <name>Hadder</name>
+    <inceptionYear>2019</inceptionYear>
+    <description>Hadder is a multi-purpose Discord bot.</description>
+    <url>https://github.com/BBN-Holding/Hadder</url>
 
-  <name>Hadder</name>
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License v3.0</name>
+            <url>https://www.gnu.org/licenses/agpl-3.0.en.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-  <properties>
+    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.13</maven.compiler.source>
+        <maven.compiler.source>1.15</maven.compiler.source>
-    <maven.compiler.target>1.13</maven.compiler.target>
+        <maven.compiler.target>1.15</maven.compiler.target>
-  </properties>
+        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
+    </properties>
 
-  <dependencies>
+    <developers>
-    <dependency>
+        <developer>
-      <groupId>net.dv8tion</groupId>
+            <id>Hax#6775</id>
-      <artifactId>JDA</artifactId>
+            <name>Hax</name>
-      <version>4.1.0_90</version>
+            <email>hax@bbn.one</email>
-    </dependency>
+            <url>https://bbn.one/</url>
-    <dependency>
+            <timezone>Europe/Berlin</timezone>
-      <groupId>org.json</groupId>
+            <properties>
-      <artifactId>json</artifactId>
+                <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp
-      <version>20190722</version>
+                </picUrl>
-    </dependency>
+            </properties>
-      <dependency>
+        </developer>
-        <groupId>com.rethinkdb</groupId>
+        <developer>
-        <artifactId>rethinkdb-driver</artifactId>
+            <id>Skidder#6775</id>
-        <version>2.3.3</version>
+            <name>Greg</name>
-      </dependency>
+            <email>skidder@bbn.one</email>
-    <dependency>
+            <url>https://bbn.one/</url>
-      <groupId>org.slf4j</groupId>
+            <timezone>Europe/Berlin</timezone>
-      <artifactId>slf4j-simple</artifactId>
+            <properties>
-      <version>1.7.30</version>
+                <picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
-    </dependency>
+                </picUrl>
-    <dependency>
+            </properties>
-      <groupId>club.minnced</groupId>
+        </developer>
-      <artifactId>discord-webhooks</artifactId>
+    </developers>
-      <version>0.1.8</version>
-    </dependency>
-    <dependency>
-      <groupId>org.kohsuke</groupId>
-      <artifactId>github-api</artifactId>
-      <version>1.101</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sedmelluq</groupId>
-      <artifactId>lavaplayer</artifactId>
-      <version>1.3.32</version>
-    </dependency>
-  </dependencies>
 
-  <repositories>
+    <repositories>
-    <repository>
+        <repository>
-      <id>jcenter</id>
+            <id>jcenter</id>
-      <name>jcenter-bintray</name>
+            <name>jcenter-bintray</name>
-      <url>https://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
-    </repository>
+        </repository>
-  </repositories>
+        <repository>
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases</url>
+        </repository>
+    </repositories>
 
-  <build>
+    <dependencies>
-    <pluginManagement>
+        <dependency>
-      <plugins>
+            <groupId>org.apache.maven</groupId>
-        <plugin>
+            <artifactId>maven-model</artifactId>
-          <artifactId>maven-clean-plugin</artifactId>
+            <version>3.8.6</version>
-          <version>3.1.0</version>
+        </dependency>
-        </plugin>
+        <dependency>
-        <plugin>
+            <groupId>net.dv8tion</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
+            <artifactId>JDA</artifactId>
-          <version>3.1.0</version>
+            <version>4.4.0_352</version>
-        </plugin>
+        </dependency>
-        <plugin>
+        <dependency>
-          <artifactId>maven-surefire-plugin</artifactId>
+            <groupId>org.json</groupId>
-          <version>2.22.2</version>
+            <artifactId>json</artifactId>
-        </plugin>
+            <version>20220924</version>
-        <plugin>
+        </dependency>
-          <artifactId>maven-jar-plugin</artifactId>
+        <dependency>
-          <version>3.2.0</version>
+            <groupId>org.slf4j</groupId>
-          <configuration>
+            <artifactId>slf4j-simple</artifactId>
-            <finalName>Hadder-Build</finalName>
+            <version>2.0.3</version>
-            <archive>
+        </dependency>
-              <manifest>
+        <dependency>
-                <mainClass>com.bbn.hadder.Hadder</mainClass>
+            <groupId>club.minnced</groupId>
-              </manifest>
+            <artifactId>discord-webhooks</artifactId>
-            </archive>
+            <version>0.8.2</version>
-          </configuration>
+        </dependency>
-        </plugin>
+        <dependency>
-        <plugin>
+            <groupId>org.kohsuke</groupId>
-          <artifactId>maven-install-plugin</artifactId>
+            <artifactId>github-api</artifactId>
-          <version>2.5.2</version>
+            <version>1.313</version>
-        </plugin>
+        </dependency>
-        <plugin>
+        <dependency>
-          <artifactId>maven-deploy-plugin</artifactId>
+            <groupId>com.sedmelluq</groupId>
-          <version>2.8.2</version>
+            <artifactId>lavaplayer</artifactId>
-        </plugin>
+            <version>1.3.78</version>
-        <plugin>
+        </dependency>
-          <artifactId>maven-site-plugin</artifactId>
+        <dependency>
-          <version>3.8.2</version>
+            <groupId>org.mongodb</groupId>
-        </plugin>
+            <artifactId>mongodb-driver-sync</artifactId>
-        <plugin>
+            <version>4.7.1</version>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
+        </dependency>
-          <version>3.0.0</version>
+    </dependencies>
-        </plugin>
+
-      </plugins>
+    <build>
-    </pluginManagement>
+        <plugins>
-    <plugins>
+            <plugin>
-      <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
-        <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
-        <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
-        <version>3.8.1</version>
+                    <source>15</source>
-        <configuration>
+                    <target>15</target>
-          <source>13</source>
+                </configuration>
-          <target>13</target>
+            </plugin>
-        </configuration>
+            <plugin>
-      </plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
-      <plugin>
+                <configuration>
-        <artifactId>maven-assembly-plugin</artifactId>
+                    <finalName>Hadder-Build</finalName>
-        <configuration>
+                    <archive>
-          <finalName>Hadder-Build</finalName>
+                        <manifest>
-          <archive>
+                            <mainClass>one.bbn.hadder.Hadder</mainClass>
-            <manifest>
+                        </manifest>
-              <mainClass>com.bbn.hadder.Hadder</mainClass>
+                    </archive>
-            </manifest>
+                    <descriptorRefs>
-          </archive>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
-          <descriptorRefs>
+                    </descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
+                    <appendAssemblyId>false</appendAssemblyId>
-          </descriptorRefs>
+                </configuration>
-          <appendAssemblyId>false</appendAssemblyId>
+            </plugin>
-        </configuration>
+        </plugins>
-      </plugin>
+    </build>
-    </plugins>
-  </build>
 </project>

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

@@ -1,218 +0,0 @@
-package com.bbn.hadder;
-
-import com.bbn.hadder.core.Config;
-import com.rethinkdb.RethinkDB;
-import com.rethinkdb.gen.exc.ReqlOpFailedError;
-import com.rethinkdb.net.Connection;
-import org.json.JSONArray;
-
-import java.util.NoSuchElementException;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public class Rethink {
-    private RethinkDB r = RethinkDB.r;
-    private Connection conn;
-    private Config config;
-
-    Rethink(Config config) {
-        this.config = config;
-    }
-
-    public void connect() {
-        try {
-            conn = r.connection()
-                    .hostname(config.getDatabaseIP())
-                    .db(config.getDatabaseName())
-                    .port(config.getDatabasePort())
-                    .user(config.getDatabaseUsername(), config.getDatabasePassword())
-                    .connect();
-            System.out.println("DB CONNECTED");
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("DB CONNECTION FAILED");
-        }
-    }
-
-    public void disconnect() {
-        conn.close();
-        System.out.println("DISCONNECTED");
-    }
-
-    private JSONArray getAsArray(String table, String where, String value) {
-        try {
-            String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn);
-            return new JSONArray(string);
-        } catch (NoSuchElementException e) {
-            return null;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return new JSONArray();
-    }
-
-    public Object get(String table, String where, String value, String column) {
-        JSONArray array = this.getAsArray(table, where, value);
-        if (array.length() > 0)
-            if (array.getJSONObject(0).has(column))
-                return array.getJSONObject(0).get(column);
-            else return null;
-        else return null;
-    }
-
-    public void update(String table, String value, String what, String whatvalue) {
-        try {
-            r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn);
-        } catch (ClassCastException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void insert(String table, Object object) {
-        try {
-            r.table(table).insert(object).run(conn);
-        } catch (ClassCastException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void remove(String table, String where, String value) {
-        r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).delete().run(conn);
-    }
-
-    public void setup() {
-        try {
-            r.dbCreate("Hadder").run(conn);
-        } catch (ReqlOpFailedError e) {
-            System.out.println(e.getMessage());
-        }
-        try {
-            r.tableCreate("server").run(conn);
-        } catch (ReqlOpFailedError e) {
-           System.out.println(e.getMessage());
-        }
-        try {
-            r.tableCreate("user").run(conn);
-        } catch (ReqlOpFailedError e) {
-            System.out.println(e.getMessage());
-        }
-        try {
-            r.tableCreate("stars").run(conn);
-        } catch (ReqlOpFailedError e) {
-            System.out.println(e.getMessage());
-        }
-    }
-
-    public void setUserPrefix(String prefix, String user_id) {
-        this.update("user", user_id, "prefix", prefix);
-    }
-
-    public String getUserPrefix(String id) {
-        return (String) this.get("user", "id", id, "prefix");
-    }
-
-    public void setGuildPrefix(String prefix, String guild_id) {
-        this.update("server", guild_id, "prefix", prefix);
-    }
-
-    public String getGuildPrefix(String id) {
-        return (String) this.get("server", "id", id, "prefix");
-    }
-
-    public void insertGuild(String id) {
-        this.insert("server", r.hashMap("id", id)
-                .with("prefix", "h.")
-                .with("message_id", "")
-                .with("role_id", "")
-                .with("invite_detect", false)
-                .with("starboard", "")
-                .with("neededstars", "4")
-        );
-    }
-
-    public void insertUser(String id) {
-        this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en"));
-    }
-
-    public void setNeededstars(String stars, String guild_id) {
-        this.update("server", guild_id, "neededstars", stars);
-    }
-
-    public String getNeededstars(String guild_id) {
-        return (String) this.get("server", "id", guild_id, "neededstars");
-    }
-
-    public void setStarboardChannel(String guild_id, String channel_id) {
-        this.update("server", guild_id, "starboard", channel_id);
-    }
-
-    public String getStarboardChannel(String guild_id) {
-        return (String) this.get("server", "id", guild_id, "starboard");
-    }
-
-    public boolean hasStarboardChannel(String guild_id) {
-        return !this.get("server", "id", guild_id, "starboard").equals("");
-    }
-
-    public void insertStarboardMessage(String message_id, String guild_id, String starboardmessageid) {
-        this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboardmessageid));
-    }
-
-    public String getStarboardMessage(String message_id) {
-        return (String) this.get("stars", "id", message_id, "starboardmsg");
-    }
-
-    public void removeStarboardMessage(String message_id) {
-        this.remove("stars", "id", message_id);
-    }
-
-    public boolean hasStarboardMessage(String message_id) {
-        return this.get("stars", "id", message_id, "guild") != null;
-    }
-
-    public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {
-        this.update("server", guild_id, "message_id", message_id);
-        this.update("server", guild_id, "role_id", role_id);
-        this.update("server", guild_id, "accept_emote", accept_emote);
-        this.update("server", guild_id, "decline_emote", decline_emote);
-    }
-
-    public String getRulesMID(String guild_id) {
-        return (String) this.get("server", "id", guild_id, "message_id");
-    }
-
-    public String getRulesRID(String guild_id) {
-        return (String) this.get("server", "id", guild_id, "role_id");
-    }
-
-    public String getRulesAEmote(String guild_id) {
-        return this.get("server", "id", guild_id, "accept_emote").toString().replaceAll("\"", "");
-    }
-
-    public String getRulesDEmote(String guild_id) {
-        return this.get("server", "id", guild_id, "decline_emote").toString().replaceAll("\"", "");
-    }
-
-    public void setInviteDetection(String guild_id, boolean b) {
-        try {
-            r.table("server").get(guild_id).update(r.hashMap("invite_detect", b)).run(conn);
-        } catch (ClassCastException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Boolean getInviteDetection(String guild_id) {
-        return (Boolean) this.get("server", "id", guild_id, "invite_detect");
-    }
-
-    public void setLanguage(String user_id, String language) {
-        this.update("user", user_id, "language", language);
-    }
-
-    public String getLanguage(String user_id) {
-        return (String) this.get("user", "id", user_id, "language");
-    }
-
-}

src/main/java/com/bbn/hadder/audio/AudioInfo.java

@@ -1,28 +0,0 @@
-package com.bbn.hadder.audio;
-
-import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.api.entities.Member;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class AudioInfo {
-
-    private final AudioTrack track;
-    private final Member author;
-
-    AudioInfo(AudioTrack track, Member author) {
-        this.track = track;
-        this.author = author;
-    }
-
-    public AudioTrack getTrack() {
-        return track;
-    }
-
-    public Member getAuthor() {
-        return author;
-    }
-
-}

src/main/java/com/bbn/hadder/audio/AudioPlayerSendHandler.java

@@ -1,49 +0,0 @@
-package com.bbn.hadder.audio;
-
-import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
-import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import net.dv8tion.jda.api.audio.AudioSendHandler;
-
-import javax.annotation.Nullable;
-import java.nio.ByteBuffer;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class AudioPlayerSendHandler implements AudioSendHandler {
-
-    private final AudioPlayer audioPlayer;
-    private AudioFrame lastFrame;
-
-    public AudioPlayerSendHandler(AudioPlayer audioPlayer) {
-        this.audioPlayer = audioPlayer;
-    }
-
-    @Override
-    public boolean canProvide() {
-        if (lastFrame == null) {
-            lastFrame = audioPlayer.provide();
-        }
-
-        return lastFrame != null;
-    }
-
-    @Nullable
-    @Override
-    public ByteBuffer provide20MsAudio() {
-        if (lastFrame == null) {
-            lastFrame = audioPlayer.provide();
-        }
-
-        byte[] data = lastFrame != null ? lastFrame.getData() : null;
-        lastFrame = null;
-
-        return ByteBuffer.wrap(data);
-    }
-
-    @Override
-    public boolean isOpus() {
-        return true;
-    }
-}

src/main/java/com/bbn/hadder/commands/Command.java

@@ -1,17 +0,0 @@
-package com.bbn.hadder.commands;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public interface Command {
-    void executed(String[] args, CommandEvent event);
-
-    String[] labels();
-
-    String description();
-
-    String usage();
-
-    String example();
-}

src/main/java/com/bbn/hadder/commands/CommandEvent.java

@@ -1,75 +0,0 @@
-package com.bbn.hadder.commands;
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.commands.general.HelpCommand;
-import com.bbn.hadder.core.CommandHandler;
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-
-import javax.annotation.Nonnull;
-
-public class CommandEvent extends MessageReceivedEvent {
-
-    private Rethink rethink;
-    private Config config;
-    private CommandHandler commandHandler;
-    private HelpCommand helpCommand;
-    private MessageEditor messageEditor;
-    private EventWaiter eventWaiter;
-    private AudioManager audioManager;
-
-    public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
-        super(api, responseNumber, message);
-        this.rethink = rethink;
-        this.config = config;
-        this.commandHandler = commandHandler;
-        this.helpCommand = helpCommand;
-        this.messageEditor = messageEditor;
-        this.eventWaiter = eventWaiter;
-        this.audioManager = audioManager;
-    }
-
-    public CommandEvent(MessageReceivedEvent event, Rethink rethink, Config config, CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor, EventWaiter eventWaiter, AudioManager audioManager) {
-        super(event.getJDA(), event.getResponseNumber(), event.getMessage());
-        this.rethink = rethink;
-        this.config = config;
-        this.commandHandler = commandHandler;
-        this.helpCommand = helpCommand;
-        this.messageEditor = messageEditor;
-        this.eventWaiter = eventWaiter;
-        this.audioManager = audioManager;
-    }
-
-    public Rethink getRethink() {
-        return rethink;
-    }
-
-    public Config getConfig() {
-        return config;
-    }
-
-    public HelpCommand getHelpCommand() {
-        return helpCommand;
-    }
-
-    public CommandHandler getCommandHandler() {
-        return commandHandler;
-    }
-
-    public MessageEditor getMessageEditor() {
-        return messageEditor;
-    }
-
-    public EventWaiter getEventWaiter() {
-        return eventWaiter;
-    }
-
-    public AudioManager getAudioManager() {
-        return audioManager;
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.bbn.hadder.commands.fun;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Member;
-
-public class AvatarCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length == 0) {
-            Member member = event.getMember();
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            member.getUser().getAsTag(),
-                            "",
-                            "")
-                    .setImage(member.getUser().getAvatarUrl())
-                    .setFooter(member.getUser().getAsTag())
-                    .build()).queue();
-        } else if (event.getMessage().getMentionedMembers().size() == 1) {
-            Member member = event.getMessage().getMentionedMembers().get(0);
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            member.getUser().getAsTag(),
-                            "",
-                            "")
-                    .setImage(member.getUser().getAvatarUrl())
-                    .setFooter(member.getUser().getAsTag())
-                    .build()).queue();
-        } else if (args[0].length() == 18){
-            Member member = event.getGuild().getMemberById(args[0]);
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.fun.avatar.success.title",
-                            member.getUser().getAsTag(),
-                            "",
-                            "")
-                    .setImage(member.getUser().getAvatarUrl())
-                    .setFooter(member.getUser().getAsTag())
-                    .build()).queue();
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"avatar"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.fun.avatar.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[User]";
-    }
-
-    @Override
-    public String example() {
-        return "@Skidder";
-    }
-}

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

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

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

@@ -1,67 +0,0 @@
-package com.bbn.hadder.commands.fun;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.awt.*;
-import java.io.IOException;
-
-public class MemeCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-
-        OkHttpClient client = new OkHttpClient();
-        Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            JSONObject json = new JSONObject(response.body().string());
-            String url = json.getString("url");
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.fun.meme.success.title", "")
-                    .setImage(url)
-                            .setAuthor("Subreddit: " + json.getString("subreddit"))
-                    .build()).queue();
-        } catch (IOException e) {
-            e.printStackTrace();
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.ERROR,
-                            "error",
-                            "commands.fun.meme.api.error")
-                    .setColor(Color.RED)
-                    .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"meme"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.fun.meme.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.bbn.hadder.commands.general;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class AboutCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getTextChannel().sendMessage(
-                event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.about.success.title",
-                        "commands.general.about.success.description")
-                        .addField(event.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), event.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", ""), true)
-                .setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
-                .build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"about"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.about.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,60 +0,0 @@
-package com.bbn.hadder.commands.general;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public class EqualsCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getChannel().sendMessage(
-                event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.equals.string.first.request", "")
-                        .build()).queue();
-        new EventWaiter().newOnMessageEventWaiter(msgevent -> {
-            String firstString = msgevent.getMessage().getContentRaw();
-            event.getChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.general.equals.string.second.request",
-                            "").build()).queue();
-            new EventWaiter().newOnMessageEventWaiter(msgevent2 -> {
-                String secondString = msgevent2.getMessage().getContentRaw();
-                event.getChannel().sendMessage(
-                        event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                .setTitle((firstString.equals(secondString)) ? event.getMessageEditor().getTerm( "commands.general.equals.string.equals.true") : event.getMessageEditor().getTerm( "commands.general.equals.string.equals.false"))
-                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.first"), firstString, false)
-                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, false)
-                                .addField(event.getMessageEditor().getTerm( "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
-                                .build()).queue();
-            }, event.getJDA(), event.getAuthor());
-        }, event.getJDA(), event.getAuthor());
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"equals"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.equals.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.bbn.hadder.commands.general;
-
-import com.bbn.hadder.Hadder;
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public class InviteCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getTextChannel().sendMessage(
-                event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.general.invite.success.title",
-                        "",
-                        "commands.general.invite.success.description",
-                        "(https://discordapp.com/oauth2/authorize?client_id="
-                                + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId()
-                                + "&scope=bot&permissions=470133879)")
-                .build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"invite"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.invite.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,41 +0,0 @@
-package com.bbn.hadder.commands.general;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class PingCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getJDA().getRestPing().queue(ping -> event.getTextChannel().sendMessage(event.getMessageEditor()
-                .getMessage(MessageEditor.MessageType.INFO)
-                .setTitle("Ping")
-                .setDescription(String.valueOf(ping))
-                .build()).queue());
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"ping"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.general.ping.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,75 +0,0 @@
-package com.bbn.hadder.commands.misc;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-import org.kohsuke.github.GHIssue;
-import org.kohsuke.github.GHRepository;
-import org.kohsuke.github.GitHub;
-
-import java.io.IOException;
-
-public class FeedbackCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getTextChannel().sendMessage(
-                event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                "commands.misc.feedback.title.request.title",
-                "commands.misc.feedback.title.request.description")
-                .build()).queue();
-        new EventWaiter().newOnMessageEventWaiter(event1 -> {
-                String title = event1.getMessage().getContentDisplay();
-                event1.getChannel().sendMessage(event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.misc.feedback.description.request.title",
-                        "commands.misc.feedback.description.request.description")
-                        .build()).queue();
-            new EventWaiter().newOnMessageEventWaiter(event2 -> {
-                String description = event2.getMessage().getContentDisplay();
-                try {
-                    GitHub connection = GitHub.connectUsingOAuth(event.getConfig().getGitHubToken());
-                    GHRepository Hadder = connection.getOrganization("BigBotNetwork").getRepository("Hadder");
-                    GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + event.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
-                    issue.addLabels("feedback");
-                    event.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.INFO,
-                                    "commands.misc.feedback.success.title",
-                                    "")
-                                    .setDescription(issue.getHtmlUrl().toString())
-                            .build()).queue();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                }, event.getJDA(), event.getAuthor());
-            }, event.getJDA(), event.getAuthor());
-
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"feedback"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.misc.feedback.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,85 +0,0 @@
-package com.bbn.hadder.commands.misc;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-import com.bbn.hadder.utils.MessageEditor.MessageType;
-
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.VoiceChannel;
-
-import java.util.List;
-
-public class ScreenShareCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length>0) {
-            if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) {
-                if (event.getGuild().getVoiceChannelById(args[0]) != null) {
-                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.misc.screenshare.success.title", "")
-                            .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + args[0] + "/").build()).queue();
-                } else {
-                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue();
-                    event.getHelpCommand().sendHelp(this, event);
-                }
-            } else {
-                List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
-                if (vcs.size() > 1) {
-                    EmbedBuilder eb = event.getMessageEditor().getMessage(MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
-                    for (int i = 0; i < vcs.size(); i++) {
-                        VoiceChannel voiceChannel = vcs.get(i);
-                        eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
-                    }
-                    event.getChannel().sendMessage(eb.build()).queue();
-                    new EventWaiter().newOnMessageEventWaiter(msgevent -> {
-                        try {
-                            int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
-                            if (vcs.size() > i) {
-                                event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
-                                        .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
-                            } else {
-                                event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue();
-                                event.getHelpCommand().sendHelp(this, event);
-                            }
-                        } catch (NumberFormatException e) {
-                            event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue();
-                            event.getHelpCommand().sendHelp(this, event);
-                        }
-                    }, event.getJDA(), event.getAuthor());
-                } else if (vcs.size()==0) {
-                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
-                    event.getHelpCommand().sendHelp(this, event);
-                } else {
-                    event.getChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
-                            .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
-                }
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"screenshare"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.misc.screenshare.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Channel]";
-    }
-
-    @Override
-    public String example() {
-        return "Gaming-Lounge";
-    }
-}

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

@@ -1,102 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Member;
-
-@Perms(Perm.BAN_MEMBERS)
-public class BanCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getMessage().getMentionedMembers().size() == 1) {
-            Member victim = event.getMessage().getMentionedMembers().get(0);
-            if (!event.getAuthor().getId().equals(victim.getId())) {
-                if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
-                    if (event.getGuild().getSelfMember().canInteract(victim)) {
-                        event.getGuild().ban(victim, 0, "Banned by " + event.getAuthor().getAsTag()).queue();
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.INFO,
-                                        "commands.moderation.ban.success.title",
-                                        "",
-                                        "commands.moderation.ban.success.description",
-                                        victim.getUser().getName() + ".").build()).queue();
-                    } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                    }
-                } else {
-                    event.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.ERROR,
-                                    "commands.moderation.ban.error.title",
-                                    "commands.moderation.ban.myself.error.description").build()).queue();
-                }
-            } else {
-                event.getTextChannel().sendMessage
-                        (event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.ERROR,
-                                "commands.moderation.ban.error.title",
-                                "commands.moderation.ban.yourself.error.description").build()).queue();
-            }
-        } else if (event.getMessage().getMentionedMembers().size() == 0) {
-            event.getHelpCommand().sendHelp(this, event);
-        } else if (event.getMessage().getMentionedMembers().size() > 1) {
-            for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
-                Member member = event.getMessage().getMentionedMembers().get(i);
-                if (!event.getAuthor().getId().equals(member.getId())) {
-                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
-                        if (event.getGuild().getSelfMember().canInteract(member)) {
-                            event.getGuild().ban(member, 0).reason("Mass Ban by " + event.getAuthor().getAsTag()).queue();
-                        } else {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                        }
-                    } else {
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.ERROR,
-                                        "commands.moderation.ban.error.title",
-                                        "commands.moderation.ban.myself.error.description").build()).queue();
-                    }
-                } else {
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.ERROR,
-                            "commands.moderation.ban.error.title",
-                            "commands.moderation.ban.yourself.error.description").build()).queue();
-                }
-            }
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.moderation.ban.success.title",
-                    "",
-                    "commands.moderation.ban.massban.success.description",
-                    String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"ban"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.ban.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[User(s)]";
-    }
-
-    @Override
-    public String example() {
-        return "@Skidder";
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Message;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@Perms(Perm.MANAGE_MESSAGES)
-public class ClearCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length > 0) {
-            if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_MANAGE)) {
-                if (args[0].equals("all")) {
-                    List<Message> msg = event.getTextChannel().getIterableHistory().complete();
-                    for (Message message : msg) {
-                        message.delete().queue();
-                    }
-                    Message message = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.moderation.lear.all.success.title",
-                            "",
-                            "commands.moderation.lear.all.success.description",
-                            String.valueOf(msg.size()))
-                            .build()).complete();
-                    try {
-                        TimeUnit.SECONDS.sleep(3);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    message.delete().queue();
-                } else {
-                    try {
-                        int nbToDelete = Integer.parseInt(args[0]);
-                        if (nbToDelete < 1 || nbToDelete > 99) {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.number.error.title", "commands.moderation.clear.number.error.description").build()).queue();
-                        } else {
-                            List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete + 1).complete();
-                            List<Message> msgToDelete = new ArrayList<>(history);
-                            event.getTextChannel().deleteMessages(msgToDelete).queue();
-                            if (nbToDelete == 1) {
-                                Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title",
-                                        "commands.moderation.clear.success.description.singular").build()).complete();
-                                try {
-                                    TimeUnit.SECONDS.sleep(2);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                                msg.delete().queue();
-                            } else {
-                                Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.clear.success.title", "",
-                                        "commands.moderation.clear.success.description.plural", String.valueOf(nbToDelete)).build()).complete();
-                                try {
-                                    TimeUnit.SECONDS.sleep(2);
-                                } catch (InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                                msg.delete().queue();
-                            }
-                        }
-                    } catch (NumberFormatException e) {
-                        event.getHelpCommand().sendHelp(this, event);
-                    } catch (IllegalArgumentException e) {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.clear.message.error.title", "commands.moderation.clear.message.error.description")
-                                .build()).queue();
-                    }
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"clear"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.clear.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Amount]";
-    }
-
-    @Override
-    public String example() {
-        return "69";
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.TextChannel;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-@Perms(Perm.MANAGE_SERVER)
-public class EditRulesCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getRethink().getRulesMID(event.getGuild().getId()).length() == 18) {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.moderation.editrules.message.title",
-                    "commands.moderation.editrules.message.description").build()).queue();
-
-            event.getEventWaiter().newOnMessageEventWaiter(event1 -> {
-                String rules = event1.getMessage().getContentRaw();
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                        "commands.moderation.editrules.channel.title",
-                        "commands.moderation.editrules.channel.description").build()).queue();
-
-                event.getEventWaiter().newOnMessageEventWaiter(event2 -> {
-                    if (event2.getMessage().getMentionedChannels().size() == 1) {
-                        try {
-                            TextChannel channel = event2.getMessage().getMentionedChannels().get(0);
-                            checkChannel(event, rules, channel);
-                        } catch (Exception e) {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                                    "commands.moderation.editrules.channel.error.title",
-                                    "commands.moderation.editrules.channel.error.description")
-                                    .build()).queue();
-                        }
-                    } else {
-                        try {
-                            TextChannel channel = event1.getGuild().getTextChannelsByName(event2.getMessage().getContentRaw(), true).get(0);
-                            checkChannel(event, rules, channel);
-                        } catch (Exception e) {
-                            event.getTextChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.ERROR,
-                                            "commands.moderation.editrules.channel.error.title",
-                                            "commands.moderation.editrules.channel.error.description")
-                                            .build()).queue();
-                        }
-                    }
-                }, event.getJDA(), event.getAuthor());
-            }, event.getJDA(), event.getAuthor());
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.moderation.editrules.error.title", "",
-                    "commands.moderation.editrules.error.description", event.getRethink().getGuildPrefix(event.getGuild().getId())).build()).queue();
-        }
-    }
-
-    public void checkChannel(CommandEvent event, String rules, TextChannel channel) {
-        try {
-            channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).queue();
-            setRules(event, rules, channel);
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.moderation.editrules.success.title",
-                    "commands.moderation.editrules.success.description").build()).queue();
-        } catch (Exception e) {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.moderation.editrules.channel.message.error.title",
-                    "commands.moderation.editrules.channel.message.error.description").build()).queue();
-        }
-    }
-
-    public void setRules(CommandEvent event, String rules, TextChannel channel) {
-        channel.retrieveMessageById(event.getRethink().getRulesMID(event.getGuild().getId())).complete().editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                .setTitle("Rules")
-                .setDescription(rules)
-                .build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"editrules", "rulesedit", "edit_rules", "rules_edit"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.editrules.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,87 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Member;
-
-@Perms(Perm.KICK_MEMBERS)
-public class KickCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getMessage().getMentionedMembers().size() == 1) {
-            Member victim = event.getMessage().getMentionedMembers().get(0);
-            if (!event.getAuthor().getId().equals(victim.getId())) {
-                if (!event.getJDA().getSelfUser().getId().equals(victim.getId())) {
-                    if (event.getGuild().getSelfMember().canInteract(victim)) {
-                        event.getGuild().kick(victim, "Kicked by " + event.getAuthor().getAsTag()).queue();
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.INFO,
-                                        "commands.moderation.kick.success.title",
-                                        "✅",
-                                        "commands.moderation.kick.success.description",
-                                        victim.getUser().getName()).build()).queue();
-                    } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                    }
-                } else {
-                    event.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.ERROR,
-                                    "commands.moderation.kick.error.title",
-                                    "commands.moderation.kick.myself.error.description").build()).queue();
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
-            }
-        } else if (event.getMessage().getMentionedMembers().size() == 0) {
-            event.getHelpCommand().sendHelp(this, event);
-        } else if (event.getMessage().getMentionedMembers().size() > 1) {
-            for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
-                Member member = event.getMessage().getMentionedMembers().get(i);
-                if (!event.getAuthor().getId().equals(member.getId())) {
-                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
-                        if (event.getGuild().getSelfMember().canInteract(member)) {
-                            event.getGuild().kick(member).reason("Mass Kicked by " + event.getAuthor().getAsTag()).queue();
-                        } else {
-                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                        }
-                    } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.myself.error.description").build()).queue();
-                    }
-                } else {
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.moderation.kick.error.title", "commands.moderation.kick.yourself.error.description").build()).queue();
-                }
-            }
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.moderation.kick.success.title", "✅", "commands.moderation.kick.masskick.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"kick"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.kick.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[User(s)]";
-    }
-
-    @Override
-    public String example() {
-        return "@Skidder";
-    }
-}

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

@@ -1,115 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Member;
-
-@Perms(Perm.MANAGE_NICKNAMES)
-public class NickCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getSelfMember().hasPermission(Permission.NICKNAME_MANAGE)) {
-            if (event.getMessage().getMentionedMembers().size() == 1) {
-                if (!event.getMessage().getMentionedMembers().get(0).getId().equals(event.getGuild().getSelfMember().getId())) {
-                    if (event.getGuild().getSelfMember().canInteract(event.getMessage().getMentionedMembers().get(0))) {
-                        if (args.length > 1) {
-                            if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
-                                event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
-                                event.getTextChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.INFO,
-                                                "commands.moderation.nick.success.title",
-                                                "✅",
-                                                "commands.moderation.nick.success.description",
-                                                event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
-                                        ).build()).queue();
-                            } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
-                                event.getGuild().modifyNickname(event.getMessage().getMentionedMembers().get(0), event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
-                                event.getTextChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.INFO,
-                                                "commands.moderation.nick.success.title",
-                                                "✅",
-                                                "commands.moderation.nick.success.description", event.getMessage().getMentionedMembers().get(0).getUser().getAsTag()
-                                        ).build()).queue();
-                            }
-                        } else {
-                            event.getHelpCommand().sendHelp(this, event);
-                        }
-                    } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                    }
-                } else {
-                    if (event.getMessage().getContentRaw().startsWith(event.getRethink().getUserPrefix(event.getMember().getId()))) {
-                        event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getUserPrefix(event.getMember().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.INFO,
-                                        "commands.moderation.nick.success.title",
-                                        "✅",
-                                        "commands.moderation.nick.myself.success.description",
-                                        "").build()).queue();
-                    } else if (event.getMessage().getContentRaw().startsWith(event.getRethink().getGuildPrefix(event.getGuild().getId()))) {
-                        event.getGuild().getSelfMember().modifyNickname(event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "nick " + args[0], "")).reason("Nicked by " + event.getAuthor().getAsTag()).queue();
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.INFO,
-                                        "commands.moderation.nick.success.title",
-                                        "✅",
-                                        "commands.moderation.nick.myself.success.description", ""
-                                ).build()).queue();
-                    }
-                }
-            } else if (event.getMessage().getMentionedMembers().size() == 0) {
-                event.getHelpCommand().sendHelp(this, event);
-            } else {
-                for (int i = 0; i < event.getMessage().getMentionedMembers().size(); i++) {
-                    Member member = event.getMessage().getMentionedMembers().get(i);
-                    if (!event.getJDA().getSelfUser().getId().equals(member.getId())) {
-                        event.getGuild().modifyNickname(member, args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
-                    } else {
-                        event.getGuild().getSelfMember().modifyNickname(args[args.length - 1]).reason("Mass Nicked by " + event.getAuthor().getAsTag()).queue();
-                    }
-                }
-                event.getTextChannel().sendMessage(
-                        event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.INFO,
-                                "commands.moderation.nick.success.title",
-                                "✅",
-                                "commands.moderation.nick.myself.success.description", String.valueOf(event.getMessage().getMentionedMembers().size())
-                        ).build()).queue();
-            }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"nick"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.nick.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[User(s)] [New nickname]";
-    }
-
-    @Override
-    public String example() {
-        return "@Skidder Cutie";
-    }
-}

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

@@ -1,55 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-
-@Perms(Perm.MANAGE_SERVER)
-public class PrefixCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length == 1) {
-            if (!args[0].contains("\"")) {
-                event.getRethink().setGuildPrefix(args[0], event.getGuild().getId());
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.moderation.prefix.success.title",
-                        "✅",
-                        "commands.moderation.prefix.success.description",
-                        args[0]).build()
-                ).queue();
-            } else {
-                event.getTextChannel().sendMessage(
-                        event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.WARNING,
-                                "",
-                                "commands.moderation.prefix.error.description").build()).queue();
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"prefix"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.prefix.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[New Prefix]";
-    }
-
-    @Override
-    public String example() {
-        return "!";
-    }
-}

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

@@ -1,106 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Role;
-
-@Perms(Perm.MANAGE_ROLES)
-public class RoleCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length > 0) {
-            if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
-                switch (args[0].toLowerCase()) {
-                    case "add":
-                        if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
-                            for (Member member : event.getMessage().getMentionedMembers()) {
-                                for (Role role : event.getMessage().getMentionedRoles()) {
-                                    if (event.getGuild().getSelfMember().canInteract(member)) {
-                                        if (event.getGuild().getSelfMember().canInteract(role)) {
-                                            event.getGuild().addRoleToMember(member, role).reason("Role added by " + event.getAuthor().getAsTag()).queue();
-                                        } else {
-                                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                                        }
-                                    } else {
-                                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                                    }
-                                }
-                            }
-                            event.getChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.INFO,
-                                            "commands.moderation.role.add.success.title",
-                                            "✅",
-                                            "",
-                                            "commands.moderation.role.add.success.description",
-                                            String.valueOf(event.getMessage().getMentionedRoles().size()),
-                                            String.valueOf(event.getMessage().getMentionedMembers().size()))
-                                            .build()).queue();
-                        }
-                        break;
-
-                    case "remove":
-                        if (event.getMessage().getMentionedMembers().size() > 0 && event.getMessage().getMentionedRoles().size() > 0) {
-                            for (Member member : event.getMessage().getMentionedMembers()) {
-                                for (Role role : event.getMessage().getMentionedRoles()) {
-                                    if (event.getGuild().getSelfMember().canInteract(member)) {
-                                        if (event.getGuild().getSelfMember().canInteract(role)) {
-                                            event.getGuild().removeRoleFromMember(member, role).reason("Role removed by " + event.getAuthor().getAsTag()).queue();
-                                        } else {
-                                            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                                        }
-                                    } else {
-                                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-                                    }
-                                }
-                            }
-                            event.getChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.INFO,
-                                            "commands.moderation.role.remove.success.title",
-                                            "",
-                                            "",
-                                            "commands.moderation.role.remove.success.description",
-                                            String.valueOf(event.getMessage().getMentionedRoles().size()),
-                                            String.valueOf(event.getMessage().getMentionedMembers().size()))
-                                            .build()).queue();
-                        }
-                        break;
-                    default:
-                        event.getHelpCommand().sendHelp(this, event);
-                        break;
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"role", "roles"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.role.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[add/remove] [Role>] [User]";
-    }
-
-    @Override
-    public String example() {
-        return "add @Skidder @Epic-Gamer";
-    }
-}

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

@@ -1,240 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Emote;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
-
-@Perms(Perm.MANAGE_SERVER)
-public class RulesCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.moderation.rules.setup.title",
-                            "commands.moderation.rules.setup.description")
-                            .build()).queue();
-            event.getEventWaiter().newOnMessageEventWaiter(event1 -> {
-                if (event1.getMessage().getMentionedChannels().size() == 1) {
-                    try {
-                        TextChannel channel = event1.getMessage().getMentionedChannels().get(0);
-                        createRules(event, event1, channel);
-                    } catch (Exception e) {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                                "commands.moderation.rules.channel.error.title",
-                                "commands.moderation.rules.channel.error.description")
-                                .build()).queue();
-                    }
-                } else {
-                    try {
-                        TextChannel channel = event1.getGuild().getTextChannelsByName(event1.getMessage().getContentRaw(), true).get(0);
-                        createRules(event, event1, channel);
-                    } catch (Exception e) {
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.ERROR,
-                                        "commands.moderation.rules.channel.error.title",
-                                        "commands.moderation.rules.channel.error.description")
-                                        .build()).queue();
-                    }
-                }
-            }, event.getJDA(), event.getAuthor());
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-        }
-    }
-
-    public void createRules(CommandEvent event, GuildMessageReceivedEvent event1, TextChannel channel) {
-        if (channel.getGuild().getId().equals(event1.getGuild().getId())) {
-            if (event.getGuild().getSelfMember().hasPermission(channel, Permission.MESSAGE_WRITE)) {
-                event1.getChannel().sendMessage(
-                        event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.INFO,
-                                "commands.moderation.rules.rules.title",
-                                "",
-                                "commands.moderation.rules.rules.description",
-                                channel.getName())
-                        .build()).queue();
-                event.getEventWaiter().newOnMessageEventWaiter(event2 -> {
-                    String message = event2.getMessage().getContentRaw();
-                    event2.getChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.INFO,
-                                    "commands.moderation.rules.role.title",
-                                    "commands.moderation.rules.role.description")
-                            .build()).queue();
-                    new EventWaiter().newOnMessageEventWaiter(event3 -> {
-                        if (event3.getMessage().getMentionedRoles().size() == 1) {
-                            Role role = event3.getMessage().getMentionedRoles().get(0);
-                            setRole(event, channel, message, event3, role);
-                        } else if (event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).size() > 0) {
-                                Role role = event3.getGuild().getRolesByName(event3.getMessage().getContentStripped(), true).get(0);
-                                setRole(event, channel, message, event3, role);
-                        } else {
-                            event3.getChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.ERROR,
-                                            "commands.moderation.rules.role.error.title",
-                                            "commands.moderation.rules.role.error.description")
-                                    .build()).queue();
-                        }
-                    }, event.getJDA(), event.getAuthor());
-                }, event.getJDA(), event.getAuthor());
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.moderation.rules.error.message.title",
-                        "commands.moderation.rules.error.message.description")
-                        .build()).queue();
-            }
-        } else {
-            event.getTextChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.ERROR,
-                            "commands.moderation.rules.guild.error.title",
-                            "commands.moderation.rules.guild.error.description")
-                    .build()).queue();
-        }
-    }
-
-    public void setRole(CommandEvent event, TextChannel channel, String message, GuildMessageReceivedEvent event3, Role role) {
-        if (event3.getGuild().getSelfMember().canInteract(role)) {
-            event3.getChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                            "commands.moderation.rules.emote.accept.title",
-                            "",
-                            "commands.moderation.rules.emote.accept.description", role.getName())
-                    .build()).queue();
-            event.getEventWaiter().newOnMessageEventWaiter(event4 -> {
-                if (event4.getMessage().getEmotes().size() == 1) {
-                    Emote aemote = event4.getMessage().getEmotes().get(0);
-                    event4.getChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.INFO,
-                                    "commands.moderation.rules.emote.decline.title", "",
-                                    "commands.moderation.rules.emote.decline.description", String.valueOf(aemote))
-                            .build()).queue();
-                    event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
-                        Emote demote = event5.getMessage().getEmotes().get(0);
-                        if (!aemote.equals(demote)) {
-                            Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                    .setTitle("Rules")
-                                    .setDescription(message)
-                                    .build()).complete();
-                            try {
-                                rules.addReaction(aemote).queue();
-                                rules.addReaction(demote).queue();
-                                event5.getChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.INFO,
-                                                "commands.moderation.rules.success.title",
-                                                "",
-                                                "commands.moderation.rules.success.description",
-                                                channel.getAsMention())
-                                        .build()).queue();
-                            } catch (Exception e) {
-                                event5.getChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.ERROR,
-                                                "error",
-                                                "commands.moderation.rules.emote.error.access.description")
-                                        .build()).queue();
-                                e.printStackTrace();
-                            }
-                            event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
-                        } else {
-                            event.getTextChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.ERROR,
-                                            "commands.moderation.rules.emote.error.equal.title",
-                                            "commands.moderation.rules.emote.error.equal.description")
-                                    .build()).queue();
-                        }
-                    }, event.getJDA(), event.getAuthor());
-                } else {
-                    String aemote = event4.getMessage().getContentRaw();
-                    event4.getChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                    MessageEditor.MessageType.INFO,
-                                    "commands.moderation.rules.emote.decline.title",
-                                    "commands.moderation.rules.emoji.decline.description")
-                            .build()).queue();
-                    event.getEventWaiter().newOnMessageEventWaiter(event5 -> {
-                        String demote = event5.getMessage().getContentRaw();
-                        if (!aemote.equals(demote)) {
-                            Message rules = channel.sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                    .setTitle("Rules")
-                                    .setDescription(message)
-                                    .build()).complete();
-                            try {
-                                rules.addReaction(aemote).queue();
-                                rules.addReaction(demote).queue();
-                                event5.getChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.INFO,
-                                                "commands.moderation.rules.success.title",
-                                                "",
-                                                "commands.moderation.rules.success.description",
-                                                channel.getAsMention())
-                                        .build()).queue();
-                            } catch (Exception e) {
-                                event5.getChannel().sendMessage(
-                                        event.getMessageEditor().getMessage(
-                                                MessageEditor.MessageType.ERROR,
-                                                "error",
-                                                "commands.moderation.rules.emoji.error.description")
-                                        .build()).queue();
-                                e.printStackTrace();
-                            }
-                            event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
-                        } else {
-                            event.getTextChannel().sendMessage(
-                                    event.getMessageEditor().getMessage(
-                                            MessageEditor.MessageType.ERROR,
-                                            "commands.moderation.rules.emote.error.equal.title",
-                                            "commands.moderation.rules.emote.error.equal.description")
-                                    .build()).queue();
-                        }
-                    }, event.getJDA(), event.getAuthor());
-                }
-            }, event.getJDA(), event.getAuthor());
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"rules", "rule", "setup"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.moderation.rules.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,55 +0,0 @@
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.TextChannel;
-
-public class StarBoardCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getMessage().getMentionedChannels().size()==1) {
-            event.getRethink().setStarboardChannel(event.getGuild().getId(), event.getMessage().getMentionedChannels().get(0).getId());
-            event.getChannel().sendMessage(
-                    event.getMessageEditor().getMessage(
-                            MessageEditor.MessageType.INFO,
-                                            "commands.moderation.starboard.success.title","")
-                            .build())
-                    .queue();
-        } else {
-            if (args.length>0) {
-                TextChannel channel = event.getGuild().getTextChannelById(args[0]);
-                if (channel!=null) {
-                    event.getRethink().setStarboardChannel(event.getGuild().getId(), channel.getId());
-                }
-            } else {
-                event.getHelpCommand().sendHelp(this, event);
-            }
-        }
-
-        if (args.length==2) {
-            event.getRethink().setNeededstars(args[1], event.getGuild().getId());
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"starboard"};
-    }
-
-    @Override
-    public String description() {
-        return "Sets the starboard channel";
-    }
-
-    @Override
-    public String usage() {
-        return "[Channel] [Needed stars]";
-    }
-
-    @Override
-    public String example() {
-        return "#starboard 4";
-    }
-}

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

@@ -1,50 +0,0 @@
-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 com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class InfoCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
-            AudioTrack track = event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack();
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.music.info.success.title", "")
-                    .setAuthor(track.getInfo().author)
-                    .addField("Title", track.getInfo().title, true)
-                    .addField("Progress", "`[ " + event.getAudioManager().getTimestamp(track.getPosition()) + " / " + event.getAudioManager().getTimestamp(track.getInfo().length) + " ]`", false)
-                    .build()).queue();
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.music.info.error.title",
-                    "commands.music.info.error.description").build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"info", "songinfo"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.info.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,84 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.VoiceChannel;
-import net.dv8tion.jda.api.managers.AudioManager;
-
-
-public class JoinCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getMember().getVoiceState().inVoiceChannel()) {
-            AudioManager audioManager = event.getGuild().getAudioManager();
-            if(!audioManager.isAttemptingToConnect()) {
-                VoiceChannel vc = event.getMember().getVoiceState().getChannel();
-                if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
-                    if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {
-                        event.getGuild().getAudioManager().openAudioConnection(vc);
-                        event.getTextChannel().sendMessage(
-                                event.getMessageEditor().getMessage(
-                                        MessageEditor.MessageType.INFO,
-                                        "commands.music.join.success.title",
-                                        "",
-                                        "commands.music.join.success.description",
-                                        vc.getName())
-                                .build()).queue();
-                    } else {
-                        event.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
-                                MessageEditor.MessageType.WARNING,
-                                "commands.music.join.error.connecting.already.title",
-                                "commands.music.join.error.connecting.already.description")
-                                .build()).queue();
-                    }
-                } else {
-                    event.getGuild().getAudioManager().openAudioConnection(vc);
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.music.join.success.title", "",
-                        "commands.music.join.success.description", vc.getName())
-                        .build()).queue();
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                    MessageEditor.MessageType.WARNING,
-                    "commands.music.join.error.connecting.trying.title",
-                    "commands.music.join.error.connecting.trying.description")
-                    .build()).queue();
-            }
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                MessageEditor.MessageType.ERROR,
-                "commands.music.join.error.channel.title",
-                "commands.music.join.error.channel.description")
-                    .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"join"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.join.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,50 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class LeaveCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
-            event.getGuild().getAudioManager().closeAudioConnection();
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                MessageEditor.MessageType.INFO,
-                "commands.music.leave.success.title",
-                "commands.music.leave.success.description")
-                    .build()).queue();
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                MessageEditor.MessageType.ERROR,
-                "commands.music.leave.error.tile",
-                "commands.music.leave.error.description")
-                    .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"leave", "quit"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.leave.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,62 +0,0 @@
-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 net.dv8tion.jda.api.entities.Message;
-
-import java.net.URL;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class PlayCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length > 0) {
-            if (event.getMember().getVoiceState().inVoiceChannel()) {
-                String input = event.getMessage().getContentRaw().replaceFirst(event.getRethink().getGuildPrefix(event.getGuild().getId()) + "play ", "").replaceFirst(event.getRethink().getUserPrefix(event.getAuthor().getId()) + "play ", "");
-                try {
-                    new URL(input).toURI();
-                    Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "commands.music.play.load.title", "⭕",
-                            "commands.music.play.load.description", "").build()).complete();
-                    event.getAudioManager().loadTrack(input, event, msg);
-                } catch (Exception ignore) {
-                    Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "commands.music.play.load.title", "⭕",
-                            "commands.music.play.load.description", "").build()).complete();
-                    event.getAudioManager().loadTrack("ytsearch: " + input, event, msg);
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.ERROR,
-                        "commands.music.join.error.channel.title",
-                        "commands.music.join.error.channel.description")
-                        .build()).queue();
-            }
-        } else event.getHelpCommand().sendHelp(this, event);
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"play"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.play.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Song URL/Name]";
-    }
-
-    @Override
-    public String example() {
-        return "Last Christmas";
-    }
-}

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

@@ -1,55 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-import com.bbn.hadder.audio.AudioInfo;
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-import java.util.Set;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class QueueCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (!event.getAudioManager().hasPlayer(event.getGuild()) || event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.music.queue.error.title",
-                    "commands.music.queue.error.description"
-            ).build()).queue();
-        } else {
-            Set<AudioInfo> queue = event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks();
-            StringBuilder builder = new StringBuilder();
-            for (AudioInfo g : queue) {
-                builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
-            }
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.music.queue.success.title", "",
-                    "commands.music.queue.success.description", builder.toString())
-                    .build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"queue"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.queue.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class SkipCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) {
-            event.getAudioManager().forceSkipTrack(event);
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.music.skip.success.title",
-                    "commands.music.skip.success.description").build()).queue();
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.music.info.error.title",
-                    "commands.music.info.error.description").build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"skip"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.skip.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class StopCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
-            event.getAudioManager().players.remove(event.getGuild().getId());
-            event.getAudioManager().getPlayer(event.getGuild()).destroy();
-            event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue();
-            event.getGuild().getAudioManager().closeAudioConnection();
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.music.stop.success.title",
-                    "commands.music.stop.success.description").build()).queue();
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                    "commands.music.info.error.title",
-                    "commands.music.info.error.description").build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"stop"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.stop.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.bbn.hadder.commands.music;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class VolumeCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length > 0) {
-            if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) {
-                try {
-                    int volume = Integer.parseInt(args[0]);
-                    if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) {
-                        event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume);
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                                "commands.music.volume.success.title", "",
-                                "commands.music.volume.success.description", String.valueOf(volume)).build()).queue();
-                    } else {
-                        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                                "commands.music.volume.error.int.title",
-                                "commands.music.volume.error.int.description").build()).queue();
-                    }
-                } catch (NumberFormatException e) {
-                    event.getHelpCommand().sendHelp(this, event);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            } else {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.music.info.error.title",
-                        "commands.music.info.error.description").build()).queue();
-            }
-        } else event.getHelpCommand().sendHelp(this, event);
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"volume"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.music.volume.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[New volume]";
-    }
-
-    @Override
-    public String example() {
-        return "100";
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java

@@ -1,67 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class AnalCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/anal/").build();
-
-            try {
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Anal")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"anal"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.anal.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java

@@ -1,67 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class BDSMCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/img/bdsm_lewd").build();
-
-            try {
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("BDSM")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "bdsm" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.bdsm.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java

@@ -1,64 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.io.IOException;
-
-public class BlowjobCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/blowjob").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                String url = response.body().string().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Blowjob")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"blowjob"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.blowjob.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class BoobsCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/tits/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Boobs")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"boobs", "boob", "tits"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.boobs.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class CumCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/cum/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Cum")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"cum"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.cum.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java

@@ -1,64 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.io.IOException;
-
-public class EroticCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/erok").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                String url = response.body().string().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Erotic")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"erotic"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.erotic.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class FeetCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/feet/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Feet")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"feet"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.feet.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class FingeringCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/pussy_wank/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Fingering")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"fingering"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.fingering.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class LickingCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/kuni/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Licking")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"licking"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.linking.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class PornCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/classic/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Porn")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"porn"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.porn.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java

@@ -1,64 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.io.IOException;
-
-public class PussyCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/pussy").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                String url = response.body().string().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Pussy")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"pussy"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.pussy.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java

@@ -1,72 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class RandomPornCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/all_tags/")
-                    .build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel()
-                        .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                                .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
-                                        url.replace("\"}", ""))
-                                .setImage(url.replace("\"}", "")).setFooter("Random Porn").build())
-                        .queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel()
-                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
-                    .queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "randomporn", "pornrandom" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.randomporn.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java

@@ -1,68 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class SoloCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/girls_solo/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"), url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", ""))
-                        .setFooter("Solo")
-                        .build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build()).queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"solo"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.solo.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java

@@ -1,69 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import java.io.IOException;
-
-public class SpankCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://api.nekos.dev/api/v3/images/nsfw/gif/spank/").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                JSONObject json = new JSONObject(response.body().string());
-                JSONObject data = json.getJSONObject("data");
-                JSONObject response1 = data.getJSONObject("response");
-                String url = response1.toString().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
-                                url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", "")).setFooter("Spank").build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel()
-                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
-                    .queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "spank", "beat", "hit" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.spank.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java

@@ -1,65 +0,0 @@
-package com.bbn.hadder.commands.nsfw;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.io.IOException;
-
-public class TransCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (event.getTextChannel().isNSFW()) {
-
-            OkHttpClient caller = new OkHttpClient();
-            Request request = new Request.Builder().url("https://nekos.life/api/v2/img/trap").build();
-
-            try {
-
-                Response response = caller.newCall(request).execute();
-                String url = response.body().string().replace("{\"url\":\"", "");
-
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                        .setAuthor(event.getMessageEditor().getTerm("commands.nsfw.gif.error.title"),
-                                url.replace("\"}", ""))
-                        .setImage(url.replace("\"}", "")).setFooter("Trans").build()).queue();
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-        } else {
-            event.getTextChannel()
-                    .sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.NO_NSFW).build())
-                    .queue();
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "trans" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.nsfw.trans.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,56 +0,0 @@
-package com.bbn.hadder.commands.owner;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Guild;
-
-@Perms(Perm.BOT_OWNER)
-public class GuildLeaveCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length > 0) {
-            Guild guild = event.getJDA().getGuildById(args[0]);
-            try {
-                guild.leave().queue();
-                event.getTextChannel()
-                        .sendMessage(event.getMessageEditor()
-                                .getMessage(MessageEditor.MessageType.INFO, "commands.owner.guildleave.success.title",
-                                        "", "commands.owner.guildleave.success.description", guild.getName())
-                                .build())
-                        .queue();
-            } catch (Exception e) {
-                event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.owner.guildleave.error.title", "", "commands.owner.guildleave.help.description", guild.getName()).build()).queue();
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"guildleave"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.owner.guildleave.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Guild-ID]";
-    }
-
-    @Override
-    public String example() {
-        return "366971954244354048";
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.bbn.hadder.commands.owner;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-
-@Perms(Perm.BOT_OWNER)
-public class RebootCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        Runtime.getRuntime().exit(69);
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"restart", "restart"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.owner.reboot.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.bbn.hadder.commands.owner;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-
-@Perms(Perm.BOT_OWNER)
-public class ShutdownCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
-        event.getJDA().getShardManager().shutdown();
-        System.out.println("Bot shut down via Command...");
-        Runtime.getRuntime().exit(69);
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"shutdown", "exit"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.owner.shutdown.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.bbn.hadder.commands.owner;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor.MessageType;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public class TestCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[]{"test"};
-    }
-
-    @Override
-    public String description() {
-        return "commands.owner.test.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -1,74 +0,0 @@
-package com.bbn.hadder.commands.settings;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class LanguageCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length == 1) {
-            switch (args[0].toLowerCase()) {
-            case "de":
-                setLanguage("de", "German", event);
-                break;
-            case "en":
-                setLanguage("en", "English", event);
-                break;
-            case "es":
-                setLanguage("es", "Spanish", event);
-                break;
-            case "fr":
-                setLanguage("fr", "French", event);
-                break;
-            case "ru":
-                setLanguage("ru", "Russian", event);
-                break;
-            case "tr":
-                setLanguage("tr", "Turkish", event);
-                break;
-            case "zh":
-                setLanguage("zh", "Chinese", event);
-                break;
-            }
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    public void setLanguage(String language_code, String language, CommandEvent event) {
-        event.getRethink().setLanguage(event.getAuthor().getId(), language_code);
-        event.getTextChannel()
-                .sendMessage(
-                        event.getMessageEditor()
-                                .getMessage(MessageEditor.MessageType.INFO, "commands.settings.language.success.title",
-                                        "", "commands.settings.language.success.description", language)
-                                .build())
-                .queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "language" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.settings.language.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[Language code]";
-    }
-
-    @Override
-    public String example() {
-        return "de";
-    }
-}

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

@@ -1,46 +0,0 @@
-package com.bbn.hadder.commands.settings;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
-
-public class UserPrefixCommand implements Command {
-
-    public void executed(String[] args, CommandEvent event) {
-        if (args.length == 1) {
-            event.getRethink().setUserPrefix(args[0], event.getAuthor().getId());
-            event.getTextChannel()
-                    .sendMessage(event.getMessageEditor()
-                            .getMessage(MessageEditor.MessageType.INFO, "commands.settings.prefix.success.title", "",
-                                    "commands.settings.prefix.success.description", args[0])
-                            .build())
-                    .queue();
-        } else {
-            event.getHelpCommand().sendHelp(this, event);
-        }
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[] { "userprefix" };
-    }
-
-    @Override
-    public String description() {
-        return "commands.settings.prefix.help.description";
-    }
-
-    @Override
-    public String usage() {
-        return "[New Prefix]";
-    }
-
-    @Override
-    public String example() {
-        return "!";
-    }
-}

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

@@ -1,61 +0,0 @@
-package com.bbn.hadder.core;
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.commands.general.HelpCommand;
-import com.bbn.hadder.utils.EventWaiter;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CommandHandler {
-
-    private List<Command> commandList;
-    private Config config;
-    private HelpCommand helpCommand;
-
-    public CommandHandler(List<Command> commandList, Config config, HelpCommand helpCommand) {
-        this.commandList = commandList;
-        this.config = config;
-        this.helpCommand = helpCommand;
-    }
-
-    public void handle(MessageReceivedEvent event, Rethink rethink, String prefix, AudioManager audioManager) {
-        String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0];
-        for (Command cmd : commandList) {
-            for (String label : cmd.labels()) {
-                if (label.equals(invoke)) {
-                    String argString = event.getMessage().getContentRaw()
-                            .replaceFirst(prefix, "").replaceFirst(invoke, "");
-                    if (argString.startsWith(" ")) argString = argString.replaceFirst(" ", "");
-                    String[] args = argString.split(" ");
-                    if (args.length > 0 && args[0].equals("")) args = new String[0];
-
-                    CommandEvent commandEvent = new CommandEvent(event.getJDA(), event.getResponseNumber(), event.getMessage(), rethink,
-                            config, this, helpCommand, new MessageEditor(rethink, event.getAuthor()), new EventWaiter(), audioManager);
-                    if (cmd.getClass().getAnnotations().length > 0 && !Arrays.asList(cmd.getClass().getAnnotations()).contains(Perms.class)) {
-                        for (Perm perm : cmd.getClass().getAnnotation(Perms.class).value()) {
-                            if (!perm.check(commandEvent)) {
-                                commandEvent.getTextChannel()
-                                        .sendMessage(commandEvent.getMessageEditor().getMessage(MessageEditor.MessageType.NO_PERMISSION).build())
-                                        .queue();
-                                return;
-                            }
-                        }
-                    }
-
-                    cmd.executed(args, commandEvent);
-                    return;
-                }
-            }
-        }
-    }
-
-    public List<Command> getCommandList() {
-        return commandList;
-    }
-}

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

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

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

@@ -1,14 +0,0 @@
-package com.bbn.hadder.core;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @author Skidder / GregTCLTK
- * @author Hax / Hax6775 / Schlauer_Hax
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Perms {
-    Perm[] value() default {};
-}

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

@@ -1,43 +0,0 @@
-package com.bbn.hadder.listener;
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.core.CommandHandler;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-public class CommandListener extends ListenerAdapter {
-
-    private Rethink rethink;
-    private CommandHandler handler;
-    private AudioManager audioManager;
-
-    public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) {
-        this.rethink = rethink;
-        this.handler = handler;
-        this.audioManager = audioManager;
-    }
-
-    @Override
-    public void onMessageReceived(MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) {
-            String[] prefixes = {
-                    rethink.getUserPrefix(event.getAuthor().getId()), rethink.getGuildPrefix(event.getGuild().getId()),
-                    event.getGuild().getSelfMember().getAsMention() + " ", event.getGuild().getSelfMember().getAsMention(),
-                    event.getGuild().getSelfMember().getAsMention().replace("@", "@!") + " ",
-                    event.getGuild().getSelfMember().getAsMention().replace("@", "@!")
-            };
-            for (String prefix : prefixes) {
-                if (event.getMessage().getContentRaw().startsWith(prefix)) {
-                    handler.handle(event, rethink, prefix, audioManager);
-                    return;
-                }
-            }
-        }
-    }
-}

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

@@ -1,73 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.utils.BotList;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
-import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
-import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import java.time.Instant;
-
-public class GuildListener extends ListenerAdapter {
-
-    private Rethink rethink;
-    private Config config;
-
-    public GuildListener(Rethink rethink, Config config) {
-        this.rethink = rethink;
-        this.config = config;
-    }
-
-    public void onGuildJoin(GuildJoinEvent event) {
-        new Thread(() -> {
-            for (Member member : event.getGuild().getMembers()) {
-                if (!member.getUser().getId().equals(event.getJDA().getSelfUser().getId())) {
-                    rethink.insertUser(member.getUser().getId());
-                }
-            }
-        }).start();
-
-        rethink.insertGuild(event.getGuild().getId());
-        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
-                .setTitle("Joined Server")
-                .setThumbnail(event.getGuild().getIconUrl())
-                .addField("Name", event.getGuild().getName(), true)
-                .addField("Guild ID", event.getGuild().getId(), true)
-                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
-                .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true)
-                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
-                .setTimestamp(Instant.now())
-                .build()).queue();
-
-        new BotList(config).post();
-    }
-
-    public void onGuildLeave(GuildLeaveEvent event) {
-        event.getJDA().getTextChannelById("475722540140986369").sendMessage(new MessageEditor(null, null).getMessage(MessageEditor.MessageType.INFO)
-                .setTitle("Left Server")
-                .setThumbnail(event.getGuild().getIconUrl())
-                .addField("Name", event.getGuild().getName(), true)
-                .addField("Guild ID", event.getGuild().getId(), true)
-                .addField("Guild Owner", event.getGuild().getOwner().getUser().getAsTag(), true)
-                .addField("Users", String.valueOf(event.getGuild().getMembers().size()), true)
-                .setFooter(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl())
-                .setTimestamp(Instant.now())
-                .build()).queue();
-
-        new BotList(config).post();
-    }
-
-    public void onGuildMemberJoin(GuildMemberJoinEvent event) {
-        if (!event.getUser().getId().equals(event.getJDA().getSelfUser().getId())) {
-            rethink.insertUser(event.getUser().getId());
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.json.JSONObject;
-
-import javax.annotation.Nonnull;
-
-public class InviteLinkListener extends ListenerAdapter {
-
-    private Rethink rethink;
-
-    public InviteLinkListener(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
-    @Override
-    public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (event.getMessage().getContentRaw().contains("discord.gg/") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) {
-                checkInvite(event.getMessage(), "discord.gg/");
-            } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && (!event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId()))) {
-                checkInvite(event.getMessage(), "discordapp.com/invite/");
-            }
-        }
-    }
-
-    public void checkInvite(Message message, String regex) {
-        String split = message.getContentRaw().split(regex, 10)[1];
-        String invite = split.split(" ")[0];
-        OkHttpClient client = new OkHttpClient();
-        Request request = new Request.Builder().url("https://canary.discordapp.com/api/v6/invites/" + invite).build();
-        try {
-            Response response = client.newCall(request).execute();
-            JSONObject json = new JSONObject(response.body().string());
-            if (!json.toString().contains("\"message\":")) {
-                message.delete().reason("Invite Link detected").queue();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void onMessageUpdate(@Nonnull MessageUpdateEvent event) {
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (event.getMessage().getContentRaw().contains("discord.gg/") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) {
-                checkInvite(event.getMessage(), "discord.gg/");
-            } else if (event.getMessage().getContentRaw().contains("discordapp.com/invite") && !event.getMember().hasPermission(Permission.ADMINISTRATOR) && rethink.getInviteDetection(event.getGuild().getId())) {
-                checkInvite(event.getMessage(), "discordapp.com/invite/");
-            }
-        }
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.bbn.hadder.listener;
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
-import java.util.Random;
-
-public class MentionListener extends ListenerAdapter {
-
-    private Rethink rethink;
-
-
-    public MentionListener(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
-    @Override
-    public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.TEXT) && (event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention())||
-                event.getMessage().getContentRaw().equals(event.getGuild().getSelfMember().getAsMention().replace("@", "@!")))) {
-            event.getChannel().sendMessage(new MessageEditor(rethink, event.getAuthor()).getMessage(MessageEditor.MessageType.INFO)
-                    .setTitle("Hello I'm Hadder.")
-                    .setAuthor(event.getJDA().getSelfUser().getName(), event.getJDA().getSelfUser().getAvatarUrl(), event.getJDA().getSelfUser().getAvatarUrl())
-                    .addField("Users", String.valueOf(event.getJDA().getUsers().size()), false)
-                    .addField("Guilds", String.valueOf(event.getJDA().getGuilds().size()), false)
-                    .addField("Prefix (User)", rethink.getUserPrefix(event.getAuthor().getId()), false)
-                    .addField("Prefix (Guild)", rethink.getGuildPrefix(event.getGuild().getId()), false)
-                    .build()).queue();
-        } else if (event.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {
-            int member = new Random().nextInt(event.getGuild().getMembers().size()-1);
-            if (member>0&&member<event.getGuild().getMembers().size()) {
-                event.getChannel().sendMessage(event.getGuild().getMembers().get(member).getAsMention()+ " (Executed by: "+event.getAuthor().getAsTag()+")").queue();
-            }
-        }
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.PrivateChannel;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import java.time.Instant;
-
-public class PrivateMessageListener extends ListenerAdapter {
-
-    private Rethink rethink;
-
-    public PrivateMessageListener(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
-    public void onMessageReceived(MessageReceivedEvent event) {
-        if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
-            PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
-            PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
-
-            Skidder.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
-                    .setTitle("New DM by " + event.getAuthor().getAsTag())
-                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
-                    .setDescription(event.getMessage().getContentRaw())
-                    .setTimestamp(Instant.now())
-                    .build()).queue();
-            Hax.sendMessage(new MessageEditor(rethink, event.getJDA().getUserById("261083609148948488")).getMessage(MessageEditor.MessageType.INFO)
-                    .setTitle("New DM by " + event.getAuthor().getAsTag())
-                    .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
-                    .setDescription(event.getMessage().getContentRaw())
-                    .setTimestamp(Instant.now())
-                    .build()).queue();
-        }
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.bbn.hadder.listener;
-
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.core.Config;
-import com.bbn.hadder.utils.BotList;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.events.ReadyEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
-
-public class ReadyListener extends ListenerAdapter {
-
-    private Rethink rethink;
-    private Config config;
-
-    public ReadyListener(Rethink rethink, Config config) {
-        this.rethink = rethink;
-        this.config = config;
-    }
-
-    @Override
-    public void onReady(@Nonnull ReadyEvent event) {
-        rethink.setup();
-        new Thread(() -> {
-            for (User user : event.getJDA().getUsers()) {
-                if (!user.getId().equals(event.getJDA().getSelfUser().getId())) {
-                    rethink.insertUser(user.getId());
-                }
-            }
-            for (Guild g : event.getJDA().getGuilds()) {
-                rethink.insertGuild(g.getId());
-            }
-        }).start();
-
-        new BotList(config).post();
-    }
-}

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

@@ -1,44 +0,0 @@
-package com.bbn.hadder.listener;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Rethink;
-import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
-import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-public class RulesListener extends ListenerAdapter {
-
-    private Rethink rethink;
-
-    public RulesListener(Rethink rethink) {
-        this.rethink = rethink;
-    }
-
-    @Override
-    public void onMessageReactionAdd(MessageReactionAddEvent event) {
-        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
-            if (event.getReactionEmote().isEmote()) {
-                if (rethink.getRulesAEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
-                    event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-                } else if (rethink.getRulesDEmote(event.getGuild().getId()).contains(event.getReactionEmote().getId())) {
-                    event.getReaction().removeReaction(event.getUser()).queue();
-                    if (event.getGuild().getSelfMember().canInteract(event.getMember())) {
-                        event.getMember().kick().reason("Declined the rules");
-                    }
-                }
-            } else if (event.getReactionEmote().isEmoji()) {
-                event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue();
-            }
-        }
-    }
-
-    @Override
-    public void onMessageReactionRemove(MessageReactionRemoveEvent event) {
-        if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) {
-                event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Withdrawal of the acceptance of the rules").queue();
-        }
-    }
-}

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

@@ -1,28 +0,0 @@
-package com.bbn.hadder.listener;
-
-import com.bbn.hadder.audio.AudioManager;
-import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-
-/**
- * @author Skidder / GregTCLTK
- */
-
-public class VoiceLeaveListener extends ListenerAdapter {
-
-    private AudioManager audioManager;
-
-    public VoiceLeaveListener(AudioManager audioManager) {
-        this.audioManager = audioManager;
-    }
-
-    @Override
-    public void onGuildVoiceLeave(GuildVoiceLeaveEvent event) {
-        if (audioManager.hasPlayer(event.getGuild()) && event.getChannelLeft().getMembers().equals(event.getGuild().getSelfMember())) {
-            audioManager.players.remove(event.getGuild().getId());
-            audioManager.getPlayer(event.getGuild()).destroy();
-            audioManager.getTrackManager(event.getGuild()).purgeQueue();
-            event.getGuild().getAudioManager().closeAudioConnection();
-        }
-    }
-}

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

@@ -1,200 +0,0 @@
-package com.bbn.hadder.utils;
-
-/*
- * @author Skidder / GregTCLTK
- */
-
-import com.bbn.hadder.Hadder;
-import com.bbn.hadder.core.Config;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-public class BotList {
-
-    private static String MythicalBotList = "https://mythicalbots.xyz/api/bot/637002314162372639";
-    private static String BotsForDiscord = "https://botsfordiscord.com/api/bot/637002314162372639";
-    private static String DiscordBotList = "https://discordbotlist.com/api/bots/637002314162372639/stats";
-    private static String DiscordBestBots = "https://discordsbestbots.xyz/api/bots/637002314162372639/stats";
-    private static String DiscordBoats = "https://discord.boats/api/bot/637002314162372639";
-    private static String YetAnotherBotList = "https://yabl.xyz/api/bot/637002314162372639/stats";
-    private static String DiscordExtremeList = "https://api.discordextremelist.xyz/v1/bot/637002314162372639";
-    private static String DiscordBotReviews = "https://discordbotreviews.xyz/api/bot/637002314162372639/stats";
-    private static String DiscordBots = "https://top.gg/api/bots/637002314162372639/stats";
-    private static String BotListSpace = "https://api.botlist.space/v1/bots/637002314162372639";
-
-    private Config config;
-
-    public BotList(Config config) {
-        this.config = config;
-    }
-
-    public void post() {
-        if (Files.notExists(Paths.get("./DEBUG"))) {
-            JSONObject json = new JSONObject();
-            json.put("server_count", Hadder.shardManager.getGuilds().size());
-            json.put("guildCount", Hadder.shardManager.getGuilds().size());
-            json.put("guilds", Hadder.shardManager.getGuilds().size());
-            json.put("users", Hadder.shardManager.getUsers().size());
-            json.put("shard_count", Hadder.shardManager.getShards().size());
-
-            RequestBody body = RequestBody.create(MediaType.parse("application/json"), json.toString());
-
-            // Mythical Bot List
-
-            Request mythicalbotlist = new Request.Builder()
-                    .url(MythicalBotList)
-                    .post(body)
-                    .addHeader("Authorization", config.getMythicalBotListToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(mythicalbotlist).execute().close();
-                System.out.println("Successfully posted count for the Mythical Bot List!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // BotsForDiscord
-
-            Request botsfordiscord = new Request.Builder()
-                    .url(BotsForDiscord)
-                    .post(body)
-                    .addHeader("Authorization", config.getBotsForDiscordToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(botsfordiscord).execute().close();
-                System.out.println("Successfully posted count to Bots For Discord!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Bot List
-
-            Request discordbotlist = new Request.Builder()
-                    .url(DiscordBotList)
-                    .post(body)
-                    .addHeader("Authorization", "Bot " + config.getDiscordBotListToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordbotlist).execute().close();
-                System.out.println("Successfully posted count for the Discord Bot List!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Best Bots
-
-            Request discordbestbots = new Request.Builder()
-                    .url(DiscordBestBots)
-                    .post(body)
-                    .addHeader("Authorization", config.getDiscordBestBotsToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordbestbots).execute().close();
-                System.out.println("Successfully posted count to Discord Best Bots!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Boats
-
-            Request discordboats = new Request.Builder()
-                    .url(DiscordBoats)
-                    .post(body)
-                    .addHeader("Authorization", config.getDiscordBoatsToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordboats).execute().close();
-                System.out.println("Successfully posted count to Discord Boats!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Yet Another Bot List
-
-            Request yetanotherbotlist = new Request.Builder()
-                    .url(YetAnotherBotList)
-                    .post(body)
-                    .addHeader("Authorization", config.getYetAnotherBotListToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(yetanotherbotlist).execute().close();
-                System.out.println("Successfully posted count to Yet Another Bot List!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Extreme List
-
-            Request discordextremelist = new Request.Builder()
-                    .url(DiscordExtremeList)
-                    .post(body)
-                    .addHeader("Authorization", config.getDiscordExtremeListToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordextremelist).execute().close();
-                System.out.println("Successfully posted count for the Discord Extreme List!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Bot Reviews
-
-            Request discordbotreviews = new Request.Builder()
-                    .url(DiscordBotReviews)
-                    .post(body)
-                    .addHeader("Authorization", config.getDiscordBotReviewsToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordbotreviews).execute().close();
-                System.out.println("Successfully posted count to Discord Bot Reviews!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // Discord Bots
-
-            Request discordbots = new Request.Builder()
-                    .url(DiscordBots)
-                    .post(body)
-                    .addHeader("Authorization", config.getDiscordBotsToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(discordbots).execute().close();
-                System.out.println("Successfully posted count to Discord Bots!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-
-            // BotListSpace
-
-            Request botlistspace = new Request.Builder()
-                    .url(BotListSpace)
-                    .post(body)
-                    .addHeader("Authorization", config.getBotListSpaceToken())
-                    .build();
-
-            try {
-                new OkHttpClient().newCall(botlistspace).execute().close();
-                System.out.println("Successfully posted count to BotList.Space!");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-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.hooks.ListenerAdapter;
-
-import javax.annotation.Nonnull;
-import java.util.function.Consumer;
-
-public class EventWaiter {
-
-    public void newOnMessageEventWaiter(Consumer<GuildMessageReceivedEvent> onEvent, JDA jda, User user) {
-        Object listener = new ListenerAdapter() {
-            @Override
-            public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
-                if (user==null) {
-                    onEvent.accept(event);
-                    event.getJDA().getShardManager().removeEventListener(this);
-                } else if (event.getAuthor().getId().equals(user.getId())) {
-                    onEvent.accept(event);
-                    event.getJDA().getShardManager().removeEventListener(this);
-                }
-            }
-        };
-        jda.getShardManager().addEventListener(listener);
-    }
-
-}

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

@@ -1,21 +1,46 @@
-package com.bbn.hadder;
+/*
+ * 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.
+ */
 
-import com.bbn.hadder.audio.AudioManager;
+package one.bbn.hadder;
-import com.bbn.hadder.commands.general.*;
+
-import com.bbn.hadder.commands.misc.*;
+import net.dv8tion.jda.api.utils.cache.CacheFlag;
-import com.bbn.hadder.commands.moderation.*;
+import one.bbn.hadder.audio.AudioManager;
-import com.bbn.hadder.commands.nsfw.*;
+import one.bbn.hadder.commands.fun.AvatarCommand;
-import com.bbn.hadder.commands.owner.*;
+import one.bbn.hadder.commands.fun.ClydeCommand;
-import com.bbn.hadder.commands.fun.*;
+import one.bbn.hadder.commands.fun.GifCommand;
-import com.bbn.hadder.commands.settings.*;
+import one.bbn.hadder.commands.fun.MemeCommand;
-import com.bbn.hadder.commands.music.*;
+import one.bbn.hadder.commands.general.*;
-import com.bbn.hadder.core.*;
+import one.bbn.hadder.commands.misc.*;
-import com.bbn.hadder.listener.*;
+import one.bbn.hadder.commands.moderation.*;
+import one.bbn.hadder.commands.music.*;
+import one.bbn.hadder.commands.nsfw.*;
+import one.bbn.hadder.commands.owner.*;
+import one.bbn.hadder.commands.settings.LanguageCommand;
+import one.bbn.hadder.commands.settings.UserPrefixCommand;
+import one.bbn.hadder.core.CommandHandler;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Mongo;
+import one.bbn.hadder.listener.*;
+import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
+import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 import net.dv8tion.jda.api.sharding.ShardManager;
+import net.dv8tion.jda.api.utils.ChunkingFilter;
 
-import javax.security.auth.login.LoginException;
 import java.util.List;
 
 public class Hadder {
@@ -31,15 +56,19 @@ public class Hadder {
         if (!config.fileExists()) config.create();
         config.load();
 
-        Rethink rethink = new Rethink(config);
+        Mongo mongo = new Mongo(config);
-        rethink.connect();
+        mongo.connect();
 
-        DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder();
+        DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(14053));
 
         builder.setAutoReconnect(true);
         builder.setShardsTotal(1);
-        builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork"));
+        builder.setChunkingFilter(ChunkingFilter.NONE);
+        builder.setBulkDeleteSplittingEnabled(true);
+        builder.setActivity(Activity.listening("h.help"));
+        builder.setStatus(OnlineStatus.DO_NOT_DISTURB);
         builder.setToken(config.getBotToken());
+        builder.disableCache(CacheFlag.ACTIVITY, CacheFlag.EMOTE, CacheFlag.CLIENT_STATUS);
 
         HelpCommand helpCommand = new HelpCommand();
         AudioManager audioManager = new AudioManager();
@@ -77,7 +106,6 @@ public class Hadder {
                         new AvatarCommand(),
                         new EvalCommand(),
                         new JoinCommand(),
-                        new LeaveCommand(),
                         new GuildLeaveCommand(),
                         new MemeCommand(),
                         new InviteDetectCommand(),
@@ -92,28 +120,39 @@ public class Hadder {
                         new LanguageCommand(),
                         new ClydeCommand(),
                         new PlayCommand(),
-                        new StarBoardCommand(),
+                        new StarboardCommand(),
                         new QueueCommand(),
                         new InfoCommand(),
                         new SkipCommand(),
                         new EditRulesCommand(),
                         new VolumeCommand(),
-                        new StopCommand()), config, helpCommand);
+                        new StopCommand(),
+                        new BlacklistCommand(),
+                        new PauseCommand(),
+                        new LoopCommand(),
+                        new BassCommand(),
+                        new EchoCommand(),
+                        new ServerStatsCommand(),
+                        new ProfileCommand(),
+                        new CodeCommand(),
+                        new MoveAllCommand(),
+                        new CoronaCommand()), config, helpCommand);
 
         builder.addEventListeners(
-                new MentionListener(rethink),
+                new MentionListener(mongo, config),
-                new PrivateMessageListener(rethink),
+                new PrivateMessageListener(mongo),
-                new CommandListener(rethink, commandHandler, audioManager),
+                new CommandListener(mongo, commandHandler, audioManager),
-                new GuildListener(rethink, config),
+                new GuildListener(mongo, config),
-                new ReadyListener(rethink, config),
+                new ReadyListener(config),
-                new InviteLinkListener(rethink),
+                new InviteLinkListener(mongo),
-                new RulesListener(rethink),
+                new RulesListener(mongo),
-                new StarboardListener(rethink),
+                new StarboardListener(mongo),
-                new VoiceLeaveListener(audioManager));
+                new VoiceLeaveListener(audioManager),
+                new OwnerMessageListener(config));
 
         try {
             shardManager = builder.build();
-        } catch (LoginException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

src/main/java/one/bbn/hadder/audio/AudioInfo.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.audio;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+import net.dv8tion.jda.api.entities.Member;
+
+public class AudioInfo {
+
+    private final AudioTrack track;
+    private final Member author;
+
+    AudioInfo(AudioTrack track, Member author) {
+        this.track = track;
+        this.author = author;
+    }
+
+    public AudioTrack getTrack() {
+        return track;
+    }
+
+    public Member getAuthor() {
+        return author;
+    }
+
+}

src/main/java/one/bbn/hadder/audio/AudioManager.java

@@ -1,7 +1,23 @@
-package com.bbn.hadder.audio;
+/*
+ * Copyright 2019-2021 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.
+ */
 
-import com.bbn.hadder.commands.CommandEvent;
+package one.bbn.hadder.audio;
-import com.bbn.hadder.utils.MessageEditor;
+
+import one.bbn.hadder.commands.CommandEvent;
+import one.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;
@@ -11,7 +27,6 @@ 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;
@@ -19,10 +34,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-/**
- * @author Skidder / GregTCLTK
- */
-
 public class AudioManager {
 
     public Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
@@ -30,6 +41,7 @@ public class AudioManager {
 
     public AudioManager() {
         AudioSourceManagers.registerRemoteSources(myManager);
+        myManager.getConfiguration().setFilterHotSwapEnabled(true);
     }
 
     public boolean hasPlayer(Guild guild) {
@@ -52,7 +64,7 @@ public class AudioManager {
 
     public AudioPlayer createPlayer(Guild guild) {
         AudioPlayer nPlayer = myManager.createPlayer();
-        TrackManager manager = new TrackManager(nPlayer);
+        TrackManager manager = new TrackManager(nPlayer, this);
         nPlayer.addListener(manager);
         guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(nPlayer));
         players.put(guild.getId(), new AbstractMap.SimpleEntry<>(nPlayer, manager));
@@ -67,17 +79,31 @@ public class AudioManager {
 
             @Override
             public void trackLoaded(AudioTrack track) {
-                getTrackManager(guild).queue(track, event.getMember());
+                if (getTrackManager(guild).getQueuedTracks().isEmpty()) {
-                msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                    getTrackManager(guild).queue(track, event.getMember());
-                        "commands.music.play.success.loading.title", "⏯",
+                    msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                        "", "")
+                            "commands.music.play.success.loading.title", "⏯",
-                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
+                            "", "")
-                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
-                        .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
-                                String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
-                                        TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
+                                    String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
-                                        TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
+                                            TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
-                        .build()).queue();
+                                            TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
+                            .build()).queue();
+                } else {
+                    getTrackManager(guild).queue(track, event.getMember());
+                    msg.editMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.music.play.success.queueing.title", "⏺",
+                            "", "")
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.title"), track.getInfo().title, false)
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.author"), track.getInfo().author, true)
+                            .addField(event.getMessageEditor().getTerm("commands.music.play.success.length"),
+                                    String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(track.getInfo().length),
+                                            TimeUnit.MILLISECONDS.toMinutes(track.getInfo().length) % TimeUnit.HOURS.toMinutes(1),
+                                            TimeUnit.MILLISECONDS.toSeconds(track.getInfo().length) % TimeUnit.MINUTES.toSeconds(1)), true)
+                            .build()).queue();
+                }
             }
 
             @Override
@@ -117,6 +143,8 @@ public class AudioManager {
         });
     }
 
+    /*
+    TODO: DJ integration
     public boolean isDj(Member member) {
         return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
     }
@@ -124,22 +152,17 @@ 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) {
+    public String getTimestamp(long m) {
-        long seconds = milis / 1000;
+        long s = m / 1000;
-        long hours = Math.floorDiv(seconds, 3600);
+        long hours = Math.floorDiv(s, 3600);
-        seconds = seconds - (hours * 3600);
+        s = s - (hours * 3600);
-        long mins = Math.floorDiv(seconds, 60);
+        long minutes = Math.floorDiv(s, 60);
-        seconds = seconds - (mins * 60);
+        s = s - (minutes * 60);
-        return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
+        return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
     }
-
-    public String getOrNull(String s) {
-        return s.isEmpty() ? "N/A" : s;
-    }
-
 }

src/main/java/one/bbn/hadder/audio/AudioPlayerSendHandler.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.audio;
+
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
+import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
+import net.dv8tion.jda.api.audio.AudioReceiveHandler;
+import net.dv8tion.jda.api.audio.AudioSendHandler;
+import net.dv8tion.jda.api.audio.CombinedAudio;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+public class AudioPlayerSendHandler implements AudioSendHandler, AudioReceiveHandler {
+
+    private final AudioPlayer audioPlayer;
+    private AudioFrame lastFrame;
+    private final Queue<byte[]> queue = new ConcurrentLinkedQueue<>();
+
+    public AudioPlayerSendHandler(AudioPlayer audioPlayer) {
+        this.audioPlayer = audioPlayer;
+    }
+
+    @Override
+    public boolean canProvide() {
+        if (audioPlayer.getPlayingTrack() == null)
+            return !queue.isEmpty();
+        else if (lastFrame == null) {
+            lastFrame = audioPlayer.provide();
+            return lastFrame != null;
+        }
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public ByteBuffer provide20MsAudio() {
+        if (audioPlayer.getPlayingTrack() == null) {
+            byte[] data = queue.poll();
+            return data == null ? null : ByteBuffer.wrap(data);
+        } else {
+            if (lastFrame == null) {
+                lastFrame = audioPlayer.provide();
+            }
+
+            byte[] data = lastFrame != null ? lastFrame.getData() : null;
+            lastFrame = null;
+
+            return ByteBuffer.wrap(data);
+        }
+    }
+
+    @Override
+    public boolean canReceiveCombined() {
+        return queue.size() < 10;
+    }
+
+    @Override
+    public void handleCombinedAudio(CombinedAudio combinedAudio) {
+        if (combinedAudio.getUsers().isEmpty())
+            return;
+
+        byte[] data = combinedAudio.getAudioData(1.0f);
+        queue.add(data);
+    }
+
+    @Override
+    public boolean isOpus() {
+        return audioPlayer.getPlayingTrack() != null;
+    }
+}

src/main/java/one/bbn/hadder/audio/TrackManager.java

@@ -1,4 +1,20 @@
-package com.bbn.hadder.audio;
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.audio;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
@@ -8,19 +24,21 @@ import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.VoiceChannel;
 
-import java.util.*;
+import java.util.LinkedHashSet;
+import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
-/**
- * @author Skidder / GregTCLTK
- */
-
 public class TrackManager extends AudioEventAdapter {
 
     private final AudioPlayer player;
+    private final AudioManager manager;
     private final Queue<AudioInfo> queue;
+    private AudioTrack lastTrack;
+    private boolean loop = false;
 
-    public TrackManager(AudioPlayer player) {
+    public TrackManager(AudioPlayer player, AudioManager manager) {
+        this.manager = manager;
         this.player = player;
         this.queue = new LinkedBlockingQueue<>();
     }
@@ -47,11 +65,19 @@ public class TrackManager extends AudioEventAdapter {
 
     @Override
     public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
-        Guild g = queue.poll().getAuthor().getGuild();
+        if (loop) {
-        if (queue.isEmpty()) {
+            this.lastTrack = track;
-            g.getAudioManager().closeAudioConnection();
+            player.playTrack(lastTrack.makeClone());
         } else {
-            player.playTrack(queue.element().getTrack());
+            Guild g = queue.poll().getAuthor().getGuild();
+            manager.getPlayer(g).stopTrack();
+            if (!queue.isEmpty()) player.playTrack(queue.element().getTrack().makeClone());
+            else {
+                manager.players.remove(g.getId());
+                manager.getPlayer(g).destroy();
+                manager.getTrackManager(g).purgeQueue();
+                g.getAudioManager().closeAudioConnection();
+            }
         }
     }
 
@@ -67,7 +93,11 @@ public class TrackManager extends AudioEventAdapter {
         queue.remove(entry);
     }
 
-    public AudioInfo getTrackInfo(AudioTrack track) {
+    public boolean isLoop() {
-        return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null);
+        return loop;
+    }
+
+    public void setLoop(boolean repeating) {
+        this.loop = repeating;
     }
 }

src/main/java/one/bbn/hadder/commands/Command.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands;
+
+public interface Command {
+    void executed(String[] args, CommandEvent e);
+
+    String[] labels();
+
+    String description();
+
+    String usage();
+
+    String example();
+}

src/main/java/one/bbn/hadder/commands/CommandEvent.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands;
+
+import one.bbn.hadder.audio.AudioManager;
+import one.bbn.hadder.commands.general.HelpCommand;
+import one.bbn.hadder.core.CommandHandler;
+import one.bbn.hadder.core.Config;
+import one.bbn.hadder.db.Mongo;
+import one.bbn.hadder.db.MongoServer;
+import one.bbn.hadder.db.MongoUser;
+import one.bbn.hadder.utils.EventWaiter;
+import one.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
+import javax.annotation.Nonnull;
+
+public class CommandEvent extends MessageReceivedEvent {
+
+    private Mongo mongo;
+    private Config config;
+    private CommandHandler commandHandler;
+    private HelpCommand helpCommand;
+    private MessageEditor messageEditor;
+    private EventWaiter eventWaiter;
+    private AudioManager audioManager;
+    private MongoUser mongoUser;
+    private MongoServer mongoServer;
+
+    public CommandEvent(@Nonnull JDA api, long responseNumber, @Nonnull Message message, Mongo mongo, Config config,
+                        CommandHandler commandHandler, HelpCommand helpCommand, MessageEditor messageEditor,
+                        EventWaiter eventWaiter, AudioManager audioManager, MongoUser mongoUser,
+                        MongoServer mongoServer) {
+        super(api, responseNumber, message);
+        this.mongo = mongo;
+        this.config = config;
+        this.commandHandler = commandHandler;
+        this.helpCommand = helpCommand;
+        this.messageEditor = messageEditor;
+        this.eventWaiter = eventWaiter;
+        this.audioManager = audioManager;
+        this.mongoUser = mongoUser;
+        this.mongoServer = mongoServer;
+    }
+
+    public Mongo getMongo() {
+        return mongo;
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    public HelpCommand getHelpCommand() {
+        return helpCommand;
+    }
+
+    public CommandHandler getCommandHandler() {
+        return commandHandler;
+    }
+
+    public MessageEditor getMessageEditor() {
+        return messageEditor;
+    }
+
+    public EventWaiter getEventWaiter() {
+        return eventWaiter;
+    }
+
+    public AudioManager getAudioManager() {
+        return audioManager;
+    }
+
+    public MongoServer getMongoServer() {
+        return mongoServer;
+    }
+
+    public MongoUser getMongoUser() {
+        return mongoUser;
+    }
+}

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

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.fun;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.entities.User;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class AvatarCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        if (args.length == 0) {
+            User u = e.getAuthor();
+            e.getTextChannel().sendMessage(
+                    e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            u.getAsTag(),
+                            "",
+                            "")
+                            .setImage(u.getAvatarUrl())
+                            .setFooter(u.getAsTag())
+                            .build()).queue();
+        } else if (e.getMessage().getMentionedUsers().size() == 1) {
+            User u = e.getMessage().getMentionedUsers().get(0);
+            e.getTextChannel().sendMessage(
+                    e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            u.getAsTag(),
+                            "",
+                            "")
+                            .setImage(u.getAvatarUrl())
+                            .setFooter(u.getAsTag())
+                            .build()).queue();
+        } else if (args[0].length() == 18) {
+            try {
+                User u = e.getJDA().getUserById(args[0]);
+                e.getTextChannel().sendMessage(
+                        e.getMessageEditor().getMessage(
+                                MessageEditor.MessageType.INFO,
+                                "commands.fun.avatar.success.title",
+                                u.getAsTag(),
+                                "",
+                                "")
+                                .setImage(u.getAvatarUrl())
+                                .setFooter(u.getAsTag())
+                                .build()).queue();
+            } catch (NullPointerException ignore) {
+
+                OkHttpClient client = new OkHttpClient();
+                Request request = new Request.Builder().url("https://canary.discord.com/api/v8/users/" + args[0]).addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build();
+
+                try {
+                    Response response = client.newCall(request).execute();
+                    JSONObject json = new JSONObject(response.body().string());
+                    String url = "https://cdn.discordapp.com/avatars/" + args[0] + "/" + json.getString("avatar") + ".png";
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.fun.avatar.success.title",
+                            json.getString("username") + "#" + json.getString("discriminator"),
+                            "",
+                            "")
+                            .setImage(url)
+                            .setFooter(json.getString("username") + "#" + json.getString("discriminator"))
+                            .build()).queue();
+                } catch (JSONException ex) {
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                            "commands.fun.avatar.error.title",
+                            "commands.fun.avatar.error.description"
+                    ).build()).queue();
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            }
+        } else {
+            e.getHelpCommand().sendHelp(this, e);
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"avatar"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.avatar.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[user]";
+    }
+
+    @Override
+    public String example() {
+        return "@Skidder";
+    }
+}

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

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

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

@@ -1,12 +1,24 @@
-package com.bbn.hadder.commands.fun;
-
 /*
- * @author Skidder / GregTCLTK
+ * Copyright 2019-2021 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.
  */
 
-import com.bbn.hadder.commands.Command;
+package one.bbn.hadder.commands.fun;
-import com.bbn.hadder.commands.CommandEvent;
+
-import com.bbn.hadder.utils.MessageEditor;
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -18,7 +30,7 @@ import java.util.Random;
 public class GifCommand implements Command {
 
     @Override
-    public void executed(String[] args, CommandEvent event) {
+    public void executed(String[] args, CommandEvent e) {
         if (args.length > 0) {
             StringBuilder query = new StringBuilder();
             for (String arg : args) {
@@ -27,7 +39,7 @@ public class GifCommand implements Command {
             }
 
             OkHttpClient client = new OkHttpClient();
-            Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + event.getConfig().getGiphyToken()).build();
+            Request request = new Request.Builder().url("http://api.giphy.com/v1/gifs/search?q=" + query + "&api_key=" + e.getConfig().getGiphyToken()).build();
             try {
                 Random rand = new Random();
                 Response response = client.newCall(request).execute();
@@ -35,15 +47,15 @@ public class GifCommand implements Command {
                 JSONArray array = json.getJSONArray("data");
                 int gifIndex = rand.nextInt(array.length());
                 String url = array.getJSONObject(gifIndex).get("url").toString();
-                event.getTextChannel().sendMessage(url).queue();
+                e.getTextChannel().sendMessage(url).queue();
-            } catch (Exception e) {
+            } catch (Exception ignore) {
-                event.getTextChannel().sendMessage(
+                e.getTextChannel().sendMessage(
-                        event.getMessageEditor().getMessage(
+                        e.getMessageEditor().getMessage(
                                 MessageEditor.MessageType.ERROR,
                                 "error",
                                 "commands.fun.gif.error.description").build()).queue();
             }
-        } else event.getHelpCommand().sendHelp(this, event);
+        } else e.getHelpCommand().sendHelp(this, e);
     }
 
     @Override
@@ -58,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";
     }
 }

src/main/java/one/bbn/hadder/commands/fun/MemeCommand.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.fun;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.awt.*;
+import java.io.IOException;
+
+public class MemeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            JSONObject json = new JSONObject(response.body().string());
+            String url = json.getString("url");
+            e.getTextChannel().sendMessage(
+                    e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.fun.meme.success.title", "")
+                            .setImage(url)
+                            .setAuthor("Subreddit: " + json.getString("subreddit"))
+                            .build()).queue();
+        } catch (IOException ignore) {
+            e.getTextChannel().sendMessage(
+                    e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.ERROR,
+                            "error",
+                            "commands.fun.meme.api.error")
+                            .setColor(Color.RED)
+                            .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"meme"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.fun.meme.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/general/AboutCommand.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.general;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+
+public class AboutCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        e.getTextChannel().sendMessage(
+                e.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.about.success.title",
+                        "commands.general.about.success.description")
+                        .addField(e.getMessageEditor().getTerm("commands.general.about.success.field.one.title"), e.getMessageEditor().getTerm("commands.general.about.success.field.one.description", "(https://donatebot.io/checkout/448554629282922527?buyer=" + e.getAuthor().getId() + "). :smiley:", ""), true)
+                        .setThumbnail("https://bbn.one/images/Hadder.png")
+                        .build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"about"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.about.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/general/EqualsCommand.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.general;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.EventWaiter;
+import one.bbn.hadder.utils.MessageEditor;
+
+public class EqualsCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        e.getChannel().sendMessage(
+                e.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.equals.string.first.request", "")
+                        .build()).queue();
+        new EventWaiter().newOnMessageEventWaiter(msge -> {
+            String firstString = msge.getMessage().getContentRaw();
+            e.getChannel().sendMessage(
+                    e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.general.equals.string.second.request",
+                            "").build()).queue();
+            new EventWaiter().newOnMessageEventWaiter(msge2 -> {
+                String secondString = msge2.getMessage().getContentRaw();
+                e.getChannel().sendMessage(
+                        e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                                .setTitle((firstString.equals(secondString)) ? e.getMessageEditor().getTerm("commands.general.equals.string.equals.true") : e.getMessageEditor().getTerm("commands.general.equals.string.equals.false"))
+                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.first"), firstString, false)
+                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.second"), secondString, false)
+                                .addField(e.getMessageEditor().getTerm("commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
+                                .build()).queue();
+            }, e.getJDA(), e.getAuthor());
+        }, e.getJDA(), e.getAuthor());
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"equals"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.equals.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

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

@@ -1,8 +1,24 @@
-package com.bbn.hadder.commands.general;
+/*
+ * Copyright 2019-2021 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.
+ */
 
-import com.bbn.hadder.commands.Command;
+package one.bbn.hadder.commands.general;
-import com.bbn.hadder.commands.CommandEvent;
+
-import com.bbn.hadder.utils.MessageEditor;
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 
@@ -13,11 +29,11 @@ import java.util.Map;
 public class HelpCommand implements Command {
 
     @Override
-    public void executed(String[] args, CommandEvent event) {
+    public void executed(String[] args, CommandEvent e) {
-        if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
+        if (e.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_EMBED_LINKS)) {
             if (args.length == 0) {
                 HashMap<String, ArrayList<Command>> hashMap = new HashMap<>();
-                for (Command cmd : event.getCommandHandler().getCommandList()) {
+                for (Command cmd : e.getCommandHandler().getCommandList()) {
                     if (!hashMap.containsKey(cmd.getClass().getPackageName())) {
                         ArrayList<Command> cmdlist = new ArrayList<>();
                         cmdlist.add(cmd);
@@ -28,8 +44,8 @@ public class HelpCommand implements Command {
                 }
                 EmbedBuilder eb = new EmbedBuilder();
                 for (Map.Entry<String, ArrayList<Command>> entry : hashMap.entrySet()) {
-                    if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (event.getAuthor().getId().equals("477141528981012511") ||
+                    if (!entry.getKey().endsWith("owner") || (entry.getKey().endsWith("owner") && (e.getAuthor().getId().equals("477141528981012511") ||
-                            event.getAuthor().getId().equals("261083609148948488")))) {
+                            e.getAuthor().getId().equals("261083609148948488")))) {
                         StringBuilder sb = new StringBuilder();
                         for (int i = 0; i < entry.getValue().size(); i++) {
                             Command cmd = entry.getValue().get(i);
@@ -40,35 +56,35 @@ public class HelpCommand implements Command {
                         eb.addField(ps[ps.length - 1], sb.toString(), false);
                     }
                 }
-                event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO);
+                e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO);
-                event.getChannel().sendMessage(eb.build()).queue();
+                e.getChannel().sendMessage(eb.build()).queue();
             } else {
-                for (Command cmd : event.getCommandHandler().getCommandList()) {
+                for (Command cmd : e.getCommandHandler().getCommandList()) {
                     for (String label : cmd.labels()) {
                         if (label.equalsIgnoreCase(args[0])) {
-                            sendHelp(cmd, event);
+                            sendHelp(cmd, e);
                         }
                     }
                 }
             }
         } else {
-            event.getTextChannel().sendMessage(event.getMessageEditor().getTerm("commands.general.help.error.description")).queue();
+            e.getTextChannel().sendMessage(e.getMessageEditor().getTerm("commands.general.help.error.description")).queue();
         }
     }
 
-    public void sendHelp(Command cmd, CommandEvent event) {
+    public void sendHelp(Command cmd, CommandEvent e) {
         if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
-                (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
+                (e.getAuthor().getId().equals("477141528981012511") || e.getAuthor().getId().equals("261083609148948488")))) {
-            String name = labels()[0];
+            String name = cmd.labels()[0];
             StringBuilder b = new StringBuilder();
-            b.append(event.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(event.getMessageEditor().getTerm(cmd.description())).append("\n");
+            b.append(e.getMessageEditor().getTerm("commands.general.help.description")).append(" ").append(e.getMessageEditor().getTerm(cmd.description())).append("\n");
             if (cmd.usage() != null) {
-                b.append(event.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.usage()).append("\n");
+                b.append(e.getMessageEditor().getTerm("commands.general.help.usage")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.usage()).append("\n");
             }
             if (cmd.example() != null) {
-                b.append(event.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(event.getRethink().getGuildPrefix(event.getGuild().getId())).append(name).append(" ").append(cmd.example());
+                b.append(e.getMessageEditor().getTerm("commands.general.help.example")).append(" ").append(e.getMongoServer().getPrefix()).append(name).append(" ").append(cmd.example());
             }
-            event.getChannel().sendMessage(event.getMessageEditor().getMessage(
+            e.getChannel().sendMessage(e.getMessageEditor().getMessage(
                     MessageEditor.MessageType.INFO)
                     .setTitle(cmd.labels()[0])
                     .setDescription(b.toString())
@@ -88,7 +104,7 @@ public class HelpCommand implements Command {
 
     @Override
     public String usage() {
-        return "[Command name]";
+        return "[command]";
     }
 
     @Override

src/main/java/one/bbn/hadder/commands/general/InviteCommand.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.general;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+
+public class InviteCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        e.getTextChannel().sendMessage(
+                e.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.general.invite.success.title",
+                        "",
+                        "commands.general.invite.success.description",
+                        "(https://discord.com/oauth2/authorize?client_id="
+                                + e.getJDA().getSelfUser().getId()
+                                + "&scope=bot&permissions=1043852663)")
+                        .build()).queue();
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"invite"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.invite.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/general/PingCommand.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.general;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+
+public class PingCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        e.getJDA().getRestPing().queue(ping -> e.getTextChannel().sendMessage(e.getMessageEditor()
+                .getMessage(MessageEditor.MessageType.INFO)
+                .setTitle("Ping")
+                .setDescription(String.valueOf(ping))
+                .build()).queue());
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"ping"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.general.ping.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/CodeCommand.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class CodeCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        if (args.length > 0) {
+            OkHttpClient client = new OkHttpClient();
+            Request request = new Request.Builder().url("https://canary.discord.com/api/v8/invite/" + args[0] + "?with_counts=true").addHeader("Authorization", "Bot " + e.getConfig().getBotToken()).build();
+
+            try {
+                Response response = client.newCall(request).execute();
+                JSONObject json = new JSONObject(response.body().string());
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                        "commands.misc.code.success.title",
+                        "commands.misc.code.success.description")
+                        .addField("Code", "[" + args[0] + "](https://discord.gg/" + args[0] + ")", true)
+                        .addField("Guild Name", json.getJSONObject("guild").getString("name"), true)
+                        .addBlankField(true)
+                        .addField("Verification Level", String.valueOf(json.getJSONObject("guild").getInt("verification_level")), true)
+                        .addField("Guild ID", json.getJSONObject("guild").getString("id"), true)
+                        .addBlankField(true)
+                        .addField("Members", String.valueOf(json.get("approximate_member_count")), true)
+                        .addBlankField(true)
+                        .addBlankField(true)
+                        .setThumbnail("https://cdn.discordapp.com/icons/" + json.getJSONObject("guild").getString("id") + "/" + json.getJSONObject("guild").getString("icon") + ".png")
+                        .build()).queue();
+            } catch (JSONException ex) {
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.code.error.title",
+                        "commands.misc.code.error.description").build()).queue();
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        } else e.getHelpCommand().sendHelp(this, e);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"code", "invite-code", "ic"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.code.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[Invite-code]";
+    }
+
+    @Override
+    public String example() {
+        return "nPwjaJk";
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/CoronaCommand.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class CoronaCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder().url("https://corona.lmao.ninja/v2/all").build();
+
+        try {
+            Response response = client.newCall(request).execute();
+            JSONObject json = new JSONObject(response.body().string());
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder
+                    .append("`Confirmed cases:` **").append(json.get("cases")).append("**\n")
+                    .append("`Deaths:` **").append(json.get("deaths")).append("** \n")
+                    .append("`Recovered:` **").append(json.get("recovered")).append("** \n")
+                    .append("`Active cases:` **").append(json.get("active")).append("**");
+            e.getTextChannel().sendMessage(e.getMessageEditor()
+                    .getMessage(MessageEditor.MessageType.INFO)
+                    .setDescription(stringBuilder)
+                    .build()).queue();
+        } catch (IOException ex) {
+            e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR)
+                    .setTitle("API Error")
+                    .setDescription("Try again later!")
+                    .build()).queue();
+        }
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"corona"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.corona.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/FeedbackCommand.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.EventWaiter;
+import one.bbn.hadder.utils.MessageEditor;
+import org.kohsuke.github.GHIssue;
+import org.kohsuke.github.GHRepository;
+import org.kohsuke.github.GitHub;
+
+import java.io.IOException;
+
+public class FeedbackCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        e.getTextChannel().sendMessage(
+                e.getMessageEditor().getMessage(
+                        MessageEditor.MessageType.INFO,
+                        "commands.misc.feedback.title.request.title",
+                        "commands.misc.feedback.title.request.description")
+                        .build()).queue();
+        new EventWaiter().newOnMessageEventWaiter(e1 -> {
+            String title = e1.getMessage().getContentDisplay();
+            e1.getChannel().sendMessage(e.getMessageEditor().getMessage(
+                    MessageEditor.MessageType.INFO,
+                    "commands.misc.feedback.description.request.title",
+                    "commands.misc.feedback.description.request.description")
+                    .build()).queue();
+            new EventWaiter().newOnMessageEventWaiter(e2 -> {
+                String description = e2.getMessage().getContentDisplay();
+                try {
+                    GitHub connection = GitHub.connectUsingOAuth(e.getConfig().getGitHubToken());
+                    GHRepository Hadder = connection.getOrganization("BBN-Holding").getRepository("Hadder");
+                    GHIssue issue = Hadder.createIssue(title).body("<strong>Feedback by " + e.getAuthor().getAsTag() + "</strong><br>" + description).label("feedback").create();
+                    issue.addLabels("feedback");
+                    e.getTextChannel().sendMessage(
+                            e.getMessageEditor().getMessage(
+                                    MessageEditor.MessageType.INFO,
+                                    "commands.misc.feedback.success.title",
+                                    "")
+                                    .setDescription(issue.getHtmlUrl().toString())
+                                    .build()).queue();
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }, e.getJDA(), e.getAuthor());
+        }, e.getJDA(), e.getAuthor());
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"feedback"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.feedback.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/GitHubCommand.java

@@ -1,12 +1,24 @@
-package com.bbn.hadder.commands.misc;
-
 /*
- * @author Skidder / GregTCLTK
+ * Copyright 2019-2021 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.
  */
 
-import com.bbn.hadder.commands.Command;
+package one.bbn.hadder.commands.misc;
-import com.bbn.hadder.commands.CommandEvent;
+
-import com.bbn.hadder.utils.MessageEditor;
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -18,11 +30,11 @@ import java.io.IOException;
 public class GitHubCommand implements Command {
 
     @Override
-    public void executed(String[] args, CommandEvent event) {
+    public void executed(String[] args, CommandEvent e) {
         if (args.length > 0) {
             if (args[0].equals("link")) {
-                event.getTextChannel().sendMessage(
+                e.getTextChannel().sendMessage(
-                        event.getMessageEditor().getMessage(
+                        e.getMessageEditor().getMessage(
                                 MessageEditor.MessageType.INFO,
                                 "commands.misc.github.link.title",
                                 "")
@@ -51,42 +63,45 @@ public class GitHubCommand implements Command {
 
                     if (!json.getString("blog").equals("")) website = json.getString("blog");
 
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
-                            .setAuthor(event.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
+                            .setAuthor(e.getMessageEditor().getTerm("commands.misc.github.success.title", nickname + " (" + args[0] + ")", ""), "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
                             .setThumbnail(json.getString("avatar_url"))
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.bio"), bio, false)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.location"), location, true)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.website"), website, true)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
-                            .addField(event.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
+                            .addField(e.getMessageEditor().getTerm("commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
                             .build()).queue();
 
-                } catch (IOException | NullPointerException e) {
+                } catch (IOException | NullPointerException ex) {
-                    event.getTextChannel().sendMessage(
+                    e.getTextChannel().sendMessage(
-                            event.getMessageEditor().getMessage(
+                            e.getMessageEditor().getMessage(
                                     MessageEditor.MessageType.ERROR,
                                     "commands.misc.github.api.error.title",
                                     "commands.misc.github.api.error.description")
                                     .build()
                     ).queue();
-                } catch (JSONException e) {
+                } catch (JSONException ex) {
-                    event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
                             MessageEditor.MessageType.ERROR,
                             "commands.misc.github.user.error.title",
                             "commands.misc.github.user.error.description").build()).queue();
                 }
             }
         } else {
-            event.getTextChannel().sendMessage(
+            e.getHelpCommand().sendHelp(this, e);
-                    event.getMessageEditor().getMessage(
+            /*
+            TODO: THIS
+            e.getTextChannel().sendMessage(
+                    e.getMessageEditor().getMessage(
                             MessageEditor.MessageType.INFO,
                             "commands.misc.github.connect.title",
                             "",
                             "commands.misc.github.connect.description",
                             "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
-                    .build()).queue();
+                    .build()).queue(); */
         }
     }
 
@@ -102,7 +117,7 @@ public class GitHubCommand implements Command {
 
     @Override
     public String usage() {
-        return "[GH name]";
+        return "[user]";
     }
 
     @Override

src/main/java/one/bbn/hadder/commands/misc/MoveAllCommand.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.core.Perm;
+import one.bbn.hadder.core.Perms;
+import one.bbn.hadder.utils.MessageEditor;
+import org.apache.commons.lang3.StringUtils;
+
+@Perms(Perm.VOICE_MOVE_OTHERS)
+public class MoveAllCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        if (args.length == 2) {
+            if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
+                if (StringUtils.isNumeric(args[1]) && args[1].length() == 18) {
+                    if (!args[0].equals(args[1])) {
+                        int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size();
+                        e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach(
+                                member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue()
+                        );
+                        e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                                "commands.misc.moveall.success.title", "",
+                                "commands.misc.moveall.success.description", String.valueOf(count))
+                                .build()).queue();
+                    } else {
+                        e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                                "commands.misc.moveall.error.equals.title",
+                                "commands.misc.moveall.error.equals.description")
+                                .build()).queue();
+                    }
+                } else {
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                            "commands.misc.moveall.error.target.int.title",
+                            "commands.misc.moveall.error.target.int.description").build()).queue();
+                }
+            } else {
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.moveall.error.source.int.title",
+                        "commands.misc.moveall.error.source.int.description").build()).queue();
+            }
+        } else if (args.length == 1) {
+            if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
+                if (e.getMember().getVoiceState().inVoiceChannel()) {
+                    int count = e.getMember().getVoiceState().getChannel().getMembers().size();
+                    e.getMember().getVoiceState().getChannel().getMembers().forEach(
+                            member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[0])).queue()
+                    );
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.misc.moveall.success.title", "",
+                            "commands.misc.moveall.success.description", String.valueOf(count))
+                            .build()).queue();
+                } else {
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                            "commands.misc.moveall.error.source.int.title",
+                            "commands.misc.moveall.error.source.int.description").build()).queue();
+                }
+            } else {
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                        "commands.misc.moveall.error.target.int.title",
+                        "commands.misc.moveall.error.target.int.description").build()).queue();
+            }
+        } else e.getHelpCommand().sendHelp(this, e);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"moveall", "move-all", "ma"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.moveall.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "([source-channel]) [target-channel]";
+    }
+
+    @Override
+    public String example() {
+        return "452806287307046923 452858405212782623";
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/ProfileCommand.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
+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) {
+        User u = null;
+        if (args.length == 0) {
+            u = e.getAuthor();
+        } else if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) {
+            u = e.getJDA().getUserById(args[0]);
+        } else if (!StringUtils.isNumeric(args[0]) && args[0].contains("#")) {
+            try {
+                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().getMentionedUsers().size() == 1) {
+            u = e.getMessage().getMentionedUsers().get(0);
+        }
+        try {
+            // TODO: Translate
+            EmbedBuilder embed = e.getMessageEditor()
+                    .getMessage(MessageEditor.MessageType.INFO)
+                    .setTitle("User Information")
+                    .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("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(e.getGuild().getMember(u).getRoles().size()), true);
+
+            e.getChannel().sendMessage(embed.build()).queue();
+        } catch (NullPointerException ex) {
+            e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
+                    "commands.misc.profile.error.title",
+                    "commands.misc.profile.error.description").build()).queue();
+        }
+
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"profile", "user", "userinfo"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.profile.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[user/id]";
+    }
+
+    @Override
+    public String example() {
+        return "Hax#6775";
+    }
+}

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.bbn.hadder.utils.EventWaiter;
+import one.bbn.hadder.utils.MessageEditor;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+
+import java.util.List;
+
+public class ScreenShareCommand implements Command {
+
+    @Override
+    public void executed(String[] args, CommandEvent e) {
+        if (args.length > 0) {
+            if (args[0].matches("[0-9]*") && args.length == 1 && args[0].length() == 18) {
+                if (e.getGuild().getVoiceChannelById(args[0]) != null) {
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(
+                            MessageEditor.MessageType.INFO,
+                            "commands.misc.screenshare.success.title", "")
+                            .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + args[0] + "/").build()).queue();
+                } else {
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.id.error.description").build()).queue();
+                    e.getHelpCommand().sendHelp(this, e);
+                }
+            } else {
+                List<VoiceChannel> vcs = e.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
+                if (vcs.size() > 1) {
+                    EmbedBuilder eb = e.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "commands.misc.screenshare.channel.error.title", "commands.misc.screenshare.channel.error.description");
+                    for (int i = 0; i < vcs.size(); i++) {
+                        VoiceChannel voiceChannel = vcs.get(i);
+                        eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
+                    }
+                    e.getChannel().sendMessage(eb.build()).queue();
+                    new EventWaiter().newOnMessageEventWaiter(msge -> {
+                        try {
+                            int i = Integer.parseInt(msge.getMessage().getContentRaw());
+                            if (vcs.size() > i) {
+                                e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
+                                        .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
+                            } else {
+                                e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.number.error.title", "").build()).queue();
+                                e.getHelpCommand().sendHelp(this, e);
+                            }
+                        } catch (NumberFormatException ex) {
+                            e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.id.error.title", "commands.misc.screenshare.number.error.description").build()).queue();
+                            e.getHelpCommand().sendHelp(this, e);
+                        }
+                    }, e.getJDA(), e.getAuthor());
+                } else if (vcs.size() == 0) {
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.misc.screenshare.channel.existing.error", "commands.misc.screenshare.channel.existing.description").build()).queue();
+                    e.getHelpCommand().sendHelp(this, e);
+                } else {
+                    e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.misc.screenshare.success.title", "")
+                            .setDescription("http://discord.com/channels/" + e.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
+                }
+            }
+        } else e.getHelpCommand().sendHelp(this, e);
+    }
+
+    @Override
+    public String[] labels() {
+        return new String[]{"screenshare"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.screenshare.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return "[channel]";
+    }
+
+    @Override
+    public String example() {
+        return "Talk";
+    }
+}

src/main/java/one/bbn/hadder/commands/misc/ServerStatsCommand.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2019-2021 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 one.bbn.hadder.commands.misc;
+
+import one.bbn.hadder.commands.Command;
+import one.bbn.hadder.commands.CommandEvent;
+import one.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) {
+        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(), 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)
+                .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)
+                .addField("Features", e.getGuild().getFeatures().toString().replaceAll("\\[", "`").replaceAll(",", "`, `").replaceAll("]", "`"), true)
+                .addBlankField(true)
+                .setThumbnail(e.getGuild().getIconUrl())
+                .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
+    public String[] labels() {
+        return new String[]{"serverstats", "guildstats"};
+    }
+
+    @Override
+    public String description() {
+        return "commands.misc.serverstats.help.description";
+    }
+
+    @Override
+    public String usage() {
+        return null;
+    }
+
+    @Override
+    public String example() {
+        return null;
+    }
+}