Merge pull request #545 from BigBotNetwork/master

Gimme more

.github/workflows/maven.yml

@@ -32,15 +32,13 @@ jobs:
           local: ./target/Hadder-Build.jar
           remote: /home/Hadder-Build.jar
           host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
+          privateKey: ${{ secrets.PK }}
-          password: ${{ secrets.PASSWORD }}
       - name: executing remote ssh commands using password
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          password: ${{ secrets.PASSWORD }}
           port: ${{ secrets.PORT }}
+          key: ${{ secrets.PK }}
           script: /home/deploy.sh
       - name: Send Webhook Notification
         if: always()

example-config.json

@@ -1,11 +1,13 @@
 {
-  "Owners":
+  "Owners": [
-  [],
+  ],
-  "Database":{"IP":"",
+  "Database": {
+    "IP": "",
     "Port": 6775,
     "DBName": "",
     "Username": "",
-    "Password": ""},
+    "Password": ""
+  },
   "Tokens": {
     "BotToken": "",
     "Giphy": "",
@@ -13,14 +15,15 @@
     "MythicalBotList": "",
     "BotsForDiscord": "",
     "DiscordBotList": "",
-    "DiscordBestBots": "",
     "DiscordBoats": "",
     "YetAnotherBotList": "",
     "DiscordExtremeList": "",
     "DiscordBotReviews": "",
     "DiscordBots": "",
     "BotListSpace": "",
-    "DiscordBots2": ""
+    "DiscordBots2": "",
+    "CloudList": "",
+    "Arcane": ""
   },
   "Clyde": ""
 }

pom.xml

@@ -1,11 +1,12 @@
 <?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"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>Hadder</groupId>
     <artifactId>Hadder</artifactId>
-  <version>1.3.11</version>
+    <version>1.3.16</version>
     <name>Hadder</name>
     <inceptionYear>2019</inceptionYear>
     <description>Hadder is a multi-purpose Discord bot.</description>
@@ -34,7 +35,8 @@
             <url>https://bigbotnetwork.com/</url>
             <timezone>Europe/Berlin</timezone>
             <properties>
-        <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp</picUrl>
+                <picUrl>https://cdn.discordapp.com/avatars/261083609148948488/f2c9efc629ef65fffa634f0d63cd467e.webp
+                </picUrl>
             </properties>
         </developer>
         <developer>
@@ -44,7 +46,8 @@
             <url>https://bigbotnetwork.com/</url>
             <timezone>Europe/Berlin</timezone>
             <properties>
-        <picUrl>https://cdn.discordapp.com/avatars/477141528981012511/a_ba4bd8e5b381874edcd06a68d1acd3aa.gif</picUrl>
+                <picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
+                </picUrl>
             </properties>
         </developer>
     </developers>
@@ -66,7 +69,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-      <version>4.1.1_155</version>
+            <version>4.2.0_204</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -76,7 +79,7 @@
         <dependency>
             <groupId>com.rethinkdb</groupId>
             <artifactId>rethinkdb-driver</artifactId>
-      <version>2.4.3</version>
+            <version>2.4.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -86,22 +89,22 @@
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>discord-webhooks</artifactId>
-      <version>0.3.1</version>
+            <version>0.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.kohsuke</groupId>
             <artifactId>github-api</artifactId>
-      <version>1.111</version>
+            <version>1.116</version>
         </dependency>
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-      <version>1.3.49</version>
+            <version>1.3.50</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-      <version>2.11.0</version>
+            <version>2.11.2</version>
         </dependency>
     </dependencies>
 
@@ -114,7 +117,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -142,11 +145,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-          <version>3.9.0</version>
+                    <version>3.9.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.0.0</version>
+                    <version>3.1.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

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

@@ -17,15 +17,21 @@
 package com.bbn.hadder;
 
 import com.bbn.hadder.audio.AudioManager;
+import com.bbn.hadder.commands.fun.AvatarCommand;
+import com.bbn.hadder.commands.fun.ClydeCommand;
+import com.bbn.hadder.commands.fun.GifCommand;
+import com.bbn.hadder.commands.fun.MemeCommand;
 import com.bbn.hadder.commands.general.*;
 import com.bbn.hadder.commands.misc.*;
 import com.bbn.hadder.commands.moderation.*;
+import com.bbn.hadder.commands.music.*;
 import com.bbn.hadder.commands.nsfw.*;
 import com.bbn.hadder.commands.owner.*;
-import com.bbn.hadder.commands.fun.*;
+import com.bbn.hadder.commands.settings.LanguageCommand;
-import com.bbn.hadder.commands.settings.*;
+import com.bbn.hadder.commands.settings.UserPrefixCommand;
-import com.bbn.hadder.commands.music.*;
+import com.bbn.hadder.core.CommandHandler;
-import com.bbn.hadder.core.*;
+import com.bbn.hadder.core.Config;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.listener.*;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
@@ -98,7 +104,6 @@ public class Hadder {
                         new AvatarCommand(),
                         new EvalCommand(),
                         new JoinCommand(),
-                        new LeaveCommand(),
                         new GuildLeaveCommand(),
                         new MemeCommand(),
                         new InviteDetectCommand(),

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

@@ -18,7 +18,10 @@ package com.bbn.hadder.audio;
 
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.utils.MessageEditor;
-import com.sedmelluq.discord.lavaplayer.player.*;
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
+import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;

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

@@ -24,7 +24,9 @@ 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;
 
 public class TrackManager extends AudioEventAdapter {
@@ -91,13 +93,11 @@ public class TrackManager extends AudioEventAdapter {
         queue.remove(entry);
     }
 
-    public boolean isLoop()
+    public boolean isLoop() {
-    {
         return loop;
     }
 
-    public void setLoop(boolean repeating)
+    public void setLoop(boolean repeating) {
-    {
         this.loop = repeating;
     }
 }

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

@@ -16,13 +16,13 @@
 
 package com.bbn.hadder.commands;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
 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.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.utils.EventWaiter;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.JDA;

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

@@ -66,7 +66,8 @@ public class ClydeCommand implements Command {
                 }
                 webhook.delete().queue();
                 e.getMessage().delete().queue();
-            } else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
+            } else
+                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
         } else e.getHelpCommand().sendHelp(this, e);
 
     }

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

@@ -41,10 +41,10 @@ public class EqualsCommand implements Command {
                 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"))
+                                .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.first"), firstString, false)
-                                .addField(e.getMessageEditor().getTerm( "commands.general.equals.string.second"), secondString, 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)
+                                .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());

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

@@ -54,10 +54,12 @@ public class GitHubCommand implements Command {
                     String website = "None";
                     try {
                         bio = json.getString("bio");
-                    } catch (JSONException ignored) {}
+                    } catch (JSONException ignored) {
+                    }
                     try {
                         location = json.getString("location");
-                    } catch (JSONException ignored) {}
+                    } catch (JSONException ignored) {
+                    }
 
                     if (!json.getString("blog").equals("")) website = json.getString("blog");
 

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

@@ -15,6 +15,7 @@
  */
 
 package com.bbn.hadder.commands.misc;
+
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.core.Perm;

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

@@ -21,7 +21,6 @@ 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;
 
@@ -31,8 +30,8 @@ public class ScreenShareCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
-        if (args.length>0) {
+        if (args.length > 0) {
-            if (args[0].matches("[0-9]*") && args.length==1 && args[0].length() == 18) {
+            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,
@@ -66,7 +65,7 @@ public class ScreenShareCommand implements Command {
                             e.getHelpCommand().sendHelp(this, e);
                         }
                     }, e.getJDA(), e.getAuthor());
-                } else if (vcs.size()==0) {
+                } 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 {

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

@@ -48,7 +48,8 @@ public class ServerStatsCommand implements Command {
                 .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);
+        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();
     }

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

@@ -68,6 +68,7 @@ public class InviteDetectCommand implements Command {
                     break;
                 default:
                     e.getHelpCommand().sendHelp(this, e);
+                    break;
             }
         } else e.getHelpCommand().sendHelp(this, e);
     }

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

@@ -108,7 +108,7 @@ public class RegionChangeCommand implements Command {
                         .build()).queue();
     }
 
-    public void setRegion (Region region, String region_name, CommandEvent e) {
+    public void setRegion(Region region, String region_name, CommandEvent e) {
         e.getGuild().getManager().setRegion(region).reason("Region changed by " + e.getAuthor().getAsTag()).queue();
         e.getTextChannel().sendMessage(
                 e.getMessageEditor().getMessage(

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bbn.hadder.commands.moderation;
-
-import com.bbn.hadder.commands.Command;
-import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.core.Perm;
-import com.bbn.hadder.core.Perms;
-import com.bbn.hadder.utils.MessageEditor;
-import net.dv8tion.jda.api.Permission;
-
-@Perms(Perm.MANAGE_ROLES)
-public class RoleAssignmentCommand implements Command {
-
-    @Override
-    public void executed(String[] args, CommandEvent e) {
-        //TODO: THIS LOL
-        if (e.getGuild().getSelfMember().hasPermission(Permission.MANAGE_ROLES)) {
-
-        } else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
-    }
-
-    @Override
-    public String[] labels() {
-        return new String[0];
-    }
-
-    @Override
-    public String description() {
-        return null;
-    }
-
-    @Override
-    public String usage() {
-        return null;
-    }
-
-    @Override
-    public String example() {
-        return null;
-    }
-}

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

@@ -25,18 +25,18 @@ public class StarboardCommand implements Command {
 
     @Override
     public void executed(String[] args, CommandEvent e) {
-        if (e.getMessage().getMentionedChannels().size()==1) {
+        if (e.getMessage().getMentionedChannels().size() == 1) {
             e.getRethinkServer().setStarboard(e.getMessage().getMentionedChannels().get(0).getId());
             e.getChannel().sendMessage(
                     e.getMessageEditor().getMessage(
                             MessageEditor.MessageType.INFO,
-                                            "commands.moderation.starboard.success.title","")
+                            "commands.moderation.starboard.success.title", "")
                             .build())
                     .queue();
         } else {
-            if (args.length>0) {
+            if (args.length > 0) {
                 TextChannel channel = e.getGuild().getTextChannelById(args[0]);
-                if (channel!=null) {
+                if (channel != null) {
                     e.getRethinkServer().setStarboard(channel.getId());
                 }
             } else e.getHelpCommand().sendHelp(this, e);

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

@@ -22,8 +22,8 @@ import com.bbn.hadder.utils.MessageEditor;
 import com.sedmelluq.discord.lavaplayer.filter.equalizer.EqualizerFactory;
 
 public class BassCommand implements Command {
-    private static final float[] BASS_BOOST = { 0.2f, 0.15f, 0.1f, 0.05f, 0.0f, -0.05f, -0.1f, -0.1f, -0.1f, -0.1f, -0.1f,
+    private static final float[] BASS_BOOST = {0.2f, 0.15f, 0.1f, 0.05f, 0.0f, -0.05f, -0.1f, -0.1f, -0.1f, -0.1f, -0.1f,
-            -0.1f, -0.1f, -0.1f, -0.1f };
+            -0.1f, -0.1f, -0.1f, -0.1f};
 
     @Override
     public void executed(String[] args, CommandEvent e) {

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

@@ -29,7 +29,7 @@ public class JoinCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getMember().getVoiceState().inVoiceChannel()) {
             AudioManager audioManager = e.getGuild().getAudioManager();
-            if(!audioManager.isAttemptingToConnect()) {
+            if (!audioManager.isAttemptingToConnect()) {
                 VoiceChannel vc = e.getMember().getVoiceState().getChannel();
                 if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
                     if (!e.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) {

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

@@ -1,69 +0,0 @@
-/*
- * Copyright 2019-2020 GregTCLTK and Schlauer-Hax
- *
- * Licensed under the GNU Affero General Public License, Version 3.0;
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    https://www.gnu.org/licenses/agpl-3.0.en.html
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.bbn.hadder.commands.music;
-
-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 e) {
-        if (e.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) {
-            if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
-                e.getGuild().getAudioManager().closeAudioConnection();
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
-                        MessageEditor.MessageType.INFO,
-                        "commands.music.leave.success.title",
-                        "commands.music.leave.success.description")
-                        .build()).queue();
-            } else {
-                e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
-                        "commands.music.leave.error.channel.title",
-                        "commands.music.leave.error.channel.description")
-                        .build()).queue();
-            }
-        } else {
-            e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(
-                MessageEditor.MessageType.ERROR,
-                "commands.music.leave.error.connected.tile",
-                "commands.music.leave.error.connected.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/QueueCommand.java

@@ -38,10 +38,10 @@ public class QueueCommand implements Command {
             long queuelength = 0;
             for (AudioInfo g : queue) {
                 queuelength = queuelength + g.getTrack().getInfo().length;
-                builder.append("("+e.getAudioManager().getTimestamp(g.getTrack().getInfo().length)+") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
+                builder.append("(" + e.getAudioManager().getTimestamp(g.getTrack().getInfo().length) + ") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n");
             }
             e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                    "commands.music.queue.success.title", "("+String.valueOf(e.getAudioManager().getTimestamp(queuelength))+")",
+                    "commands.music.queue.success.title", "(" + String.valueOf(e.getAudioManager().getTimestamp(queuelength)) + ")",
                     "commands.music.queue.success.description", builder.toString())
                     .build()).queue();
         }

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

@@ -51,7 +51,7 @@ public class RecordCommand implements Command {
             audioManager.openAudioConnection(event.getMember().getVoiceState().getChannel());
         } else {
             for (Map.Entry<String, Queue<byte[]>> key : queue.entrySet()) {
-                File file = new File("./"+event.getJDA().getUserById(key.getKey())+".wav");
+                File file = new File("./" + event.getJDA().getUserById(key.getKey()) + ".wav");
 
 
             }

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

@@ -26,10 +26,19 @@ public class SkipCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getAudioManager().hasPlayer(e.getGuild()) && !e.getAudioManager().getTrackManager(e.getGuild()).getQueuedTracks().isEmpty()) {
             if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
+                if (!e.getAudioManager().getTrackManager(e.getGuild()).isLoop()) {
                     e.getAudioManager().forceSkipTrack(e);
                     e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
                             "commands.music.skip.success.title",
                             "commands.music.skip.success.description").build()).queue();
+                } else {
+                    e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false);
+                    e.getAudioManager().forceSkipTrack(e);
+                    e.getAudioManager().getTrackManager(e.getGuild()).setLoop(true);
+                    e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
+                            "commands.music.skip.success.title",
+                            "commands.music.skip.success.description").build()).queue();
+                }
             } else {
                 e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR,
                         "commands.music.skip.error.connected.title",

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

@@ -26,6 +26,7 @@ public class StopCommand implements Command {
     public void executed(String[] args, CommandEvent e) {
         if (e.getAudioManager().hasPlayer(e.getGuild()) && e.getAudioManager().getPlayer(e.getGuild()).getPlayingTrack() != null) {
             if (e.getMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && e.getGuild().getSelfMember().getVoiceState().getChannel().equals(e.getMember().getVoiceState().getChannel())) {
+                e.getAudioManager().getTrackManager(e.getGuild()).setLoop(false);
                 e.getAudioManager().players.remove(e.getGuild().getId());
                 e.getAudioManager().getPlayer(e.getGuild()).destroy();
                 e.getAudioManager().getTrackManager(e.getGuild()).purgeQueue();
@@ -48,7 +49,7 @@ public class StopCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[]{"stop"};
+        return new String[]{"stop", "leave"};
     }
 
     @Override

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class AnalCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class BDSMCommand implements Command {
 
@@ -42,7 +42,7 @@ public class BDSMCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "bdsm" };
+        return new String[]{"bdsm"};
     }
 
     @Override

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class BlowjobCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class BoobsCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class CumCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class EroticCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class FeetCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class FingeringCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class LickingCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class PornCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class PussyCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class RandomPornCommand implements Command {
 
@@ -44,7 +44,7 @@ public class RandomPornCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "randomporn", "pornrandom" };
+        return new String[]{"randomporn", "pornrandom"};
     }
 
     @Override

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class SoloCommand implements Command {
 

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class SpankCommand implements Command {
 
@@ -42,7 +42,7 @@ public class SpankCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "spank", "beat", "hit" };
+        return new String[]{"spank", "beat", "hit"};
     }
 
     @Override

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

@@ -18,8 +18,8 @@ package com.bbn.hadder.commands.nsfw;
 
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
-import com.bbn.hadder.utils.MessageEditor;
 import com.bbn.hadder.utils.Http;
+import com.bbn.hadder.utils.MessageEditor;
 
 public class TransCommand implements Command {
 
@@ -43,7 +43,7 @@ public class TransCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "trans" };
+        return new String[]{"trans"};
     }
 
     @Override

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

@@ -16,11 +16,11 @@
 
 package com.bbn.hadder.commands.owner;
 
-import com.bbn.hadder.RethinkUser;
 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.db.RethinkUser;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.entities.User;
 
@@ -50,12 +50,12 @@ public class BlacklistCommand implements Command {
                         LinkedHashSet<String> hashSet = new LinkedHashSet<>(commands);
 
                         ArrayList<String> commandsWithoutDuplicates = new ArrayList<>(hashSet);
-                        String newblacklisted = ((commandsWithoutDuplicates.size()!=0) ? String.join(",", commandsWithoutDuplicates) : "none");
+                        String newblacklisted = ((commandsWithoutDuplicates.size() != 0) ? String.join(",", commandsWithoutDuplicates) : "none");
                         u.setBlacklisted(newblacklisted);
                         e.getTextChannel().sendMessage(
                                 e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                                        "commands.owner.blacklist.success."+args[0].toLowerCase()+".title", "",
+                                        "commands.owner.blacklist.success." + args[0].toLowerCase() + ".title", "",
-                                        "commands.owner.blacklist.success."+args[0].toLowerCase()+".description", newblacklisted)
+                                        "commands.owner.blacklist.success." + args[0].toLowerCase() + ".description", newblacklisted)
                                         .build()).queue();
                         u.push();
                     } else e.getHelpCommand().sendHelp(this, e);
@@ -75,7 +75,7 @@ public class BlacklistCommand implements Command {
                     e.getTextChannel().sendMessage(
                             e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO)
                                     .setTitle("Blacklisted Users")
-                                    .setDescription((stringBuilder.length()!=0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
+                                    .setDescription((stringBuilder.length() != 0) ? ("``" + stringBuilder.toString() + "``") : "No blacklisted Users")
                                     .build()).queue();
                     break;
 

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

@@ -49,8 +49,8 @@ public class LanguageCommand implements Command {
                     break;
                 default:
                     e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
-                            "List",
+                            "commands.settings.language.error.title", "",
-                            "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`")
+                            "commands.settings.language.error.description", "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`")
                             .build()).queue();
                     break;
             }
@@ -70,7 +70,7 @@ public class LanguageCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "language" };
+        return new String[]{"language"};
     }
 
     @Override

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

@@ -37,7 +37,7 @@ public class UserPrefixCommand implements Command {
 
     @Override
     public String[] labels() {
-        return new String[] { "userprefix" };
+        return new String[]{"userprefix"};
     }
 
     @Override

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

@@ -16,13 +16,13 @@
 
 package com.bbn.hadder.core;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
 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.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.utils.EventWaiter;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
@@ -31,7 +31,7 @@ public class Rethink {
     private Connection conn;
     private Config config;
 
-    Rethink(Config config) {
+    public Rethink(Config config) {
         this.config = config;
     }
 

src/main/java/com/bbn/hadder/db/RethinkServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 

src/main/java/com/bbn/hadder/db/RethinkUser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 

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

@@ -16,11 +16,11 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.core.CommandHandler;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
 import com.bbn.hadder.core.Config;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.utils.BotList;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.entities.Member;

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Message;

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

@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -71,7 +71,7 @@ public class MentionListener extends ListenerAdapter {
                 );
                 builder.addField("Developer", devs.toString(), false);
                 builder.addField("Join our Dev Server!", "[Click here!](https://discord.gg/58My2dM)", true);
-                builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)",false);
+                builder.addField("Github", "[Click here!](https://github.com/BigBotNetwork/Hadder)", false);
                 builder.addField("Twitch", "[Click here!](https://www.twitch.tv/bigbotnetwork)", false);
                 e.getChannel().sendMessage(builder.build()).queue();
             } else if (e.getMessage().getContentRaw().equalsIgnoreCase("@someone")) {

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

@@ -26,7 +26,7 @@ public class OwnerMessageListener extends ListenerAdapter {
             if (!emotename.contains(" ")) {
                 Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]);
                 StringBuilder sb = new StringBuilder();
-                if (emotes.length!=0) {
+                if (emotes.length != 0) {
                     for (Emote emote : emotes) {
                         sb.append(emote.getAsMention()).append(" ");
                     }

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
 import com.bbn.hadder.core.Config;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.utils.BotList;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.RethinkServer;
 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;
@@ -60,7 +60,8 @@ public class RulesListener extends ListenerAdapter {
         RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", e.getGuild().getId()), rethink);
         if (e.getMember().getRoles().contains(e.getGuild().getRoleById(rethinkServer.getRoleID()))) {
             e.getGuild().removeRoleFromMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue();
-        } else e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue();
+        } else
+            e.getGuild().addRoleToMember(e.getMember(), e.getGuild().getRoleById(rethinkServer.getRoleID())).reason("Accepted rules").queue();
     }
 
     @Override

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

@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.MessageReaction;

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

@@ -31,7 +31,7 @@ public class EventWaiter {
         Object listener = new ListenerAdapter() {
             @Override
             public void onGuildMessageReceived(@Nonnull GuildMessageReceivedEvent event) {
-                if (user==null) {
+                if (user == null) {
                     onEvent.accept(event);
                     event.getJDA().getShardManager().removeEventListener(this);
                 } else if (event.getAuthor().getId().equals(user.getId())) {
@@ -47,7 +47,7 @@ public class EventWaiter {
         Object listener = new ListenerAdapter() {
             @Override
             public void onGuildMessageReactionAdd(@Nonnull GuildMessageReactionAddEvent event) {
-                if (user==null) {
+                if (user == null) {
                     onEvent.accept(event);
                     event.getJDA().getShardManager().removeEventListener(this);
                 } else if (event.getUser().getId().equals(user.getId())) {

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

@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.utils;
 
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;
 
@@ -50,10 +50,11 @@ public class MessageEditor {
 
     public EmbedBuilder getMessage(MessageType type, String title, String title_extra, String title_extra_two,
                                    String description, String description_extra, String description_extra_two) {
-        String language = (this.user!=null) ? rethinkUser.getLanguage() : null;
+        String language = (this.user != null) ? rethinkUser.getLanguage() : null;
         EmbedBuilder eb = this.getDefaultSettings(type);
         if (!"".equals(title)) eb.setTitle(this.handle(language, title, title_extra, title_extra_two));
-        if (!"".equals(description)) eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
+        if (!"".equals(description))
+            eb.setDescription(this.handle(language, description, description_extra, description_extra_two));
         return eb;
     }
 
@@ -133,6 +134,7 @@ public class MessageEditor {
         ResourceBundle resourceBundle = ResourceBundle.getBundle("Translations/Translations", locale);
         if (resourceBundle.containsKey(string))
             return resourceBundle.getString(string).replaceAll("%extra%", extra).replaceAll("%extra_two%", extra_two);
-        else return "This key doesn't exist. Please report this to the Bot Developers. Key: `" + string + "` Language_code: `" + language_code + "`";
+        else
+            return "This key doesn't exist. Please report this to the Bot Developers. Key: `" + string + "` Language_code: `" + language_code + "`";
     }
 }

src/main/resources/Translations/Translations_de.properties

@@ -23,7 +23,7 @@ success\! = Erfolgreich\!
 commands.fun.avatar.success.title = Avatar von %extra%
 commands.fun.avatar.error.title = Benutzer nicht gefunden
 commands.fun.avatar.error.description = Ich kann keinen Benutzer mit dieser ID finden\!
-commands.fun.avatar.help.description = Sends the avatar of the specified Member.
+commands.fun.avatar.help.description = Sendet das Avatar des angegebenen Mitglieds.
 commands.fun.gif.error.description = Bitte versuche es mit einem anderen Begriff erneut.
 commands.fun.gif.help.description = Sucht nach einem GIF auf Giphy.
 commands.fun.meme.success.title = Dein zufälliges Meme\:
@@ -172,17 +172,17 @@ commands.moderation.rules.role.description = Die Regeln wurden erfolgreich festg
 commands.moderation.rules.role.error.title = Rolle existiert nicht
 commands.moderation.rules.role.error.description = Die angegebene Rolle existiert auf diesem Server nicht.
 commands.moderation.rules.role.permission.error.title = Keine Berechtigung
-commands.moderation.rules.role.permission.error.description = Du kannst diese Rolle nicht auswählen, weil du keinen Zugriff auf sie hast.
+commands.moderation.rules.role.permission.error.description = Du kannst diese Rolle nicht auswählen, da du keinen Zugriff auf sie hast.
 commands.moderation.rules.guild.error.title = Falsche Guild
-commands.moderation.rules.guild.error.description = Der erwähnte Kanal muss auf diesem Server sein\!
+commands.moderation.rules.guild.error.description = Der angegebene Kanal muss sich auf diesem Server befinden\!
 commands.moderation.rules.emote.accept.title = Benutzerdefiniertes Zustimmungsemote
 commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified.
 commands.moderation.rules.emote.decline.title = Benutzerdefiniertes Ablehnungsemote
 commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote.
-commands.moderation.rules.emote.error.access.description = Ich kann auf die benutzerdefinierten Emote(s) nicht zugreifen.
+commands.moderation.rules.emote.error.access.description = Ich kann auf benutzerdefinierten Emotes nicht zugreifen.
-commands.moderation.rules.emote.error.equal.title = Emotes sind gleich
+commands.moderation.rules.emote.error.equal.title = Die Emotes sind gleich
 commands.moderation.rules.emote.error.equal.description = Die zwei angegebenen Emotes sind gleich.
-commands.moderation.rules.emoji.decline.description = Das erste Emote wurde erfolgreich festgelegt. Bitte sende mir jetzt das Ablehnungsemote.
+commands.moderation.rules.emoji.decline.description = Das erste Emote wurde erfolgreich festgelegt. Bitte sende mir nun das Ablehnungsemote.
 commands.moderation.rules.emoji.error.description = Das angegebene Emote kann nicht verwendet werden.
 commands.moderation.rules.success.title = Regeln erfolgreich festgelegt
 commands.moderation.rules.success.description = Ich habe die Regeln erfolgreich in %extra% gesendet.
@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = Du befindest dich nicht in einem
 commands.music.join.error.permission.title = Keine Berechtigung
 commands.music.join.error.permission.description = Ich bin nicht Berechtigt deinem Sprachkanal beizutreten.
 commands.music.join.help.description = Tritt deinem Sprachkanal bei.
-commands.music.leave.success.title = Verbindung erfolgreich getrennt
-commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt
-commands.music.leave.error.channel.title = Kein Kanal
-commands.music.leave.error.channel.description = Du musst im selben Sprachkanal wie der Bot sein.
-commands.music.leave.error.connected.tile = Nicht verbunden
-commands.music.leave.error.connected.description = Ich bin derzeit in keinem Sprachkanal auf diesem Server
-commands.music.leave.help.description = Verlässt einen Sprachkanal.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Versuche das Lied zu laden...
 commands.music.play.success.loading.title = %extra% Jetzt läuft %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Sprache festgelegt
 commands.settings.language.success.description = `%extra%` ist jetzt deine neue Sprache.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Führt den angegebenen Code aus.
 commands.settings.prefix.success.title = Prefix erfolgreich gesetzt
 commands.settings.prefix.success.description = Ich habe erfolgreich den neuen Prefix für dich auf `%extra% `gesetzt.

src/main/resources/Translations/Translations_en.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.

src/main/resources/Translations/Translations_es.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.

src/main/resources/Translations/Translations_fr.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.

src/main/resources/Translations/Translations_ru.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.

src/main/resources/Translations/Translations_tr.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.

src/main/resources/Translations/Translations_zh.properties

@@ -223,13 +223,6 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
 commands.music.join.error.permission.title = No permission
 commands.music.join.error.permission.description = I am not allowed to join your voice channel.
 commands.music.join.help.description = Joins your voice channel.
-commands.music.leave.success.title = Successfully disconnected
-commands.music.leave.success.description = I successfully disconnected from the Voice Channel
-commands.music.leave.error.channel.title = No channel
-commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
-commands.music.leave.error.connected.tile = Not connected
-commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
-commands.music.leave.help.description = Leaves your voice channel.
 commands.music.play.load.title = %extra% Now loading %extra%
 commands.music.play.load.description = Trying to load the song...
 commands.music.play.success.loading.title = %extra% Now playing %extra%
@@ -332,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
 
 commands.settings.language.success.title = Language set
 commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes\: %extra%
 commands.settings.language.help.description = Sets the new primary language for a user.
 commands.settings.prefix.success.title = Successfully set prefix
 commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.