From 8615735431d8f828e7d525da2d919fac9ea79d43 Mon Sep 17 00:00:00 2001
From: MatteZ02 <47610069+MatteZ02@users.noreply.github.com>
Date: Thu, 31 Oct 2019 20:29:26 +0200
Subject: [PATCH] Option handler for playlists and settings. Exe function to
 execute command files. Command aliases updated.

---
 commands/bug.js                    |   1 +
 commands/eval.js                   |   3 +-
 commands/forcestop.js              |   3 +-
 commands/help.js                   |   1 +
 commands/invite.js                 |   1 +
 commands/loop.js                   |   3 +-
 commands/nowplaying.js             |   1 +
 commands/pause.js                  |   3 +-
 commands/play.js                   |   1 +
 commands/playlist.js               | 163 +++++------------------------
 commands/playlist/add.js           |  51 +++++++++
 commands/playlist/list.js          |  22 ++++
 commands/playlist/play.js          |  51 +++++++++
 commands/playlist/remove.js        |  14 +++
 commands/playlist/save.js          |  13 +++
 commands/queue.js                  |   1 +
 commands/remove.js                 |   3 +-
 commands/resume.js                 |   3 +-
 commands/seek.js                   |   3 +-
 commands/settings.js               | 119 +++++----------------
 commands/settings/announcesongs.js |  12 +++
 commands/settings/permissions.js   |  17 +++
 commands/settings/prefix.js        |   8 ++
 commands/settings/setDj.js         |  27 +++++
 commands/settings/setpremium.js    |  34 ++++++
 commands/settings/volume.js        |  10 ++
 commands/skip.js                   |   3 +-
 commands/status.js                 |   1 +
 commands/stop.js                   |   5 +-
 commands/volume.js                 |   3 +-
 events/message.js                  |  53 +++-------
 funcs/exe.js                       |  15 +++
 index.js                           |  21 +++-
 33 files changed, 392 insertions(+), 277 deletions(-)
 create mode 100644 commands/playlist/add.js
 create mode 100644 commands/playlist/list.js
 create mode 100644 commands/playlist/play.js
 create mode 100644 commands/playlist/remove.js
 create mode 100644 commands/playlist/save.js
 create mode 100644 commands/settings/announcesongs.js
 create mode 100644 commands/settings/permissions.js
 create mode 100644 commands/settings/prefix.js
 create mode 100644 commands/settings/setDj.js
 create mode 100644 commands/settings/setpremium.js
 create mode 100644 commands/settings/volume.js
 create mode 100644 funcs/exe.js

diff --git a/commands/bug.js b/commands/bug.js
index 88bdd70d..c6855486 100644
--- a/commands/bug.js
+++ b/commands/bug.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'bug',
     description: 'Report a bug',
+    alias: 'bug',
     cooldown: 5,
     async execute(message, args, client, Discord, prefix) {
         const embed = new Discord.RichEmbed()
diff --git a/commands/eval.js b/commands/eval.js
index 88e2630f..8065592c 100644
--- a/commands/eval.js
+++ b/commands/eval.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'eval',
     description: 'Evaluation command',
+    alias: 'eval',
     cooldown: 5,
     async execute(message, args, client, Discord, prefix) {
         const ytdl = require('ytdl-core');
@@ -8,7 +9,7 @@ module.exports = {
         if (serverQueue) {
             let data = await Promise.resolve(ytdl.getInfo(serverQueue.songs[0].url));
         }
-        if (message.author.id !== '360363051792203779') return message.channel.send(':x: You are not allowed to do that!');
+        if (message.author.id !== client.global.devId) return message.channel.send(':x: You are not allowed to do that!');
         const input = message.content.slice(prefix.length + 4);
         let output;
         try {
diff --git a/commands/forcestop.js b/commands/forcestop.js
index 415e4a23..4548ea13 100644
--- a/commands/forcestop.js
+++ b/commands/forcestop.js
@@ -1,9 +1,10 @@
 module.exports = {
     name: 'forcestop',
     description: 'force stop command.',
+    alias: 'fs',
     cooldown: 5,
     execute(message, args, client, Discord, prefix) {
-        if (message.author.id !== '360363051792203779') return message.channel.send(':x: You are not allowed to do that!')
+        if (message.author.id !== client.global.devId) return message.channel.send(':x: You are not allowed to do that!')
         client.queue.delete(message.guild.id);
         message.channel.send('queue deleted')
     }
diff --git a/commands/help.js b/commands/help.js
index 0c75e2dc..7c4c68fe 100644
--- a/commands/help.js
+++ b/commands/help.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'help',
     description: 'Help command.',
+    alias: 'help',
     cooldown: 5,
     execute(message, args, client, Discord, prefix) {
         const embed = new Discord.RichEmbed()
diff --git a/commands/invite.js b/commands/invite.js
index b4fbbf58..1f464a25 100644
--- a/commands/invite.js
+++ b/commands/invite.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'invite',
     description: 'Invite command.',
+    alias: 'invite',
     cooldown: 5,
     execute(message, args, client, Discord, prefix) {
         const embed = new Discord.RichEmbed()
diff --git a/commands/loop.js b/commands/loop.js
index 9ef44885..9655089c 100644
--- a/commands/loop.js
+++ b/commands/loop.js
@@ -1,13 +1,14 @@
 module.exports = {
     name: 'loop',
     description: 'loop command.',
+    alias: 'loop',
     cooldown: 10,
     async execute(message, args, client, Discord, prefix) {
         const serverQueue = client.queue.get(message.guild.id);
         const permissions = message.channel.permissionsFor(message.author);
         const { voiceChannel } = message.member;
         if (serverQueue) {
-            if (message.author.id !== '360363051792203779') {
+            if (message.author.id !== client.global.devId) {
                 if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to loop the queue!');
                 if (client.global.db.guilds[message.guild.id].permissions === true) {
                     if (client.global.db.guilds[message.guild.id].dj) {
diff --git a/commands/nowplaying.js b/commands/nowplaying.js
index b33528dd..7002ba00 100644
--- a/commands/nowplaying.js
+++ b/commands/nowplaying.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'nowplaying',
     description: 'Now playing command.',
+    alias: 'np',
     cooldown: 5,
     async execute(message, args, client, Discord, prefix) {
         const ytdl = require('ytdl-core');
diff --git a/commands/pause.js b/commands/pause.js
index 31a9bfd6..955d7cf6 100644
--- a/commands/pause.js
+++ b/commands/pause.js
@@ -1,6 +1,7 @@
 module.exports = {
 	name: 'pause',
 	description: 'Pause command.',
+	alias: 'pause',
 	cooldown: 5,
 	execute(message, args, client, Discord, prefix) {
 		const serverQueue = client.queue.get(message.guild.id);
@@ -8,7 +9,7 @@ module.exports = {
 		const { voiceChannel } = message.member;
 		if (serverQueue && serverQueue.playing === true) {
 			if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to pause the music!');
-			if (message.author.id !== '360363051792203779') {
+			if (message.author.id !== client.global.devId) {
 				if (client.global.db.guilds[message.guild.id].permissions === true) {
 					if (client.global.db.guilds[message.guild.id].dj) {
 						if (!message.member.roles.has(client.global.db.guilds[message.guild.id].djrole)) return message.channel.send(':x: You need the `DJ` role to pause the music!');
diff --git a/commands/play.js b/commands/play.js
index 37f416ac..b1836cd4 100644
--- a/commands/play.js
+++ b/commands/play.js
@@ -5,6 +5,7 @@ module.exports = {
 	name: 'play',
 	description: 'Play command.',
 	usage: '[song name]',
+	alias: 'p',
 	args: true,
 	cooldown: 3,
 	async execute(message, args, client, Discord, prefix) {
diff --git a/commands/playlist.js b/commands/playlist.js
index ef889596..33f259ac 100644
--- a/commands/playlist.js
+++ b/commands/playlist.js
@@ -5,152 +5,43 @@ module.exports = {
     name: 'playlist',
     usage: '[option]',
     description: 'Save and load queues',
+    alias: 'pl',
     cooldown: 10,
     async execute(message, args, client, Discord, prefix) {
+        const embed = new Discord.RichEmbed()
+            .setTitle('Options for playlist!')
+            .addField('play', 'Play the guild specific queue.', true)
+            .addField('save', 'Save the currently playing queue. Note that this will overwrite the currently saved queue!', true)
+            .addField('add', 'Add songs to the playlist. Like song selection', true)
+            .addField('remove', 'Remove songs from the playlist.', true)
+            .addField('list', 'Display the playlist.', true)
+            .setFooter(`how to use: ${prefix}playlist <Option> <Optional option>`)
+            .setAuthor(client.user.username, client.user.displayAvatarURL)
+            .setColor('#b50002')
         const permissions = message.channel.permissionsFor(message.author);
-        const serverQueue = client.queue.get(message.guild.id);
-        if (message.author.id !== '360363051792203779') {
+        if (message.author.id !== client.global.devId) {
             if (client.global.db.guilds[message.guild.id].dj) {
                 if (!message.member.roles.has(client.global.db.guilds[message.guild.id].djrole)) return message.channel.send(':x: You need the `DJ` role to modify or play the playlist!');
             } else if (!permissions.has('MANAGE_GUILD')) return message.channel.send(':x: You need the `MANAGE_SERVER` permission to modify the playlist!');
         }
         if (client.global.db.guilds[message.guild.id].premium) {
-            if (args[1] === 'play') {
-                const voiceChannel = message.member.voiceChannel;
-                if (!voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in a voice channel to play music!');
-                const permissions = voiceChannel.permissionsFor(message.client.user);
-                if (!permissions.has('CONNECT')) {
-                    return message.channel.send(':x: I cannot connect to your voice channel, make sure I have the proper permissions!');
+            if (args[1]) {
+                const optionName = args[1].toLowerCase();
+                const option = client.playlistCmd.get(optionName) || client.playlistCmd.find(cmd => cmd.aliases && cmd.aliases.includes(optionName));
+                if (!option) return message.channel.send(embed);
+                try {
+                    option.execute(message, args, client, Discord, prefix);
+                } catch (error) {
+                    message.reply(`:x: there was an error trying to execute that option! Please contact support with \`${prefix}bug\`!`);
+                    const embed = new Discord.RichEmbed()
+                        .setTitle(`Musix ${error.toString()}`)
+                        .setDescription(error.stack.replace(/at /g, '**at **'))
+                        .setColor('#b50002');
+                    client.fetchUser(client.config.devId).then(user => user.send(embed)).catch(console.error);
+                    client.channels.get('634718645188034560').send(embed);
+                    console.log(error);
                 }
-                if (!permissions.has('SPEAK')) {
-                    return message.channel.send(':x: I cannot speak in your voice channel, make sure I have the proper permissions!');
-                }
-                let songs;
-                if (!voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in a voice channel to play music!');
-                if (args[2]) {
-                    if (client.global.db.guilds[args[2]].premium && client.global.db.playlists[args[2]].saved) {
-                        songs = client.global.db.playlists[args[2]].songs;
-                    } else return message.channel.send(':x: There is no queue saved for this guild!')
-                } else {
-                    songs = client.global.db.playlists[message.guild.id].songs;
-                }
-                if (client.global.db.playlists[message.guild.id].saved) {
-                    if (!serverQueue) {
-                        const construct = {
-                            textChannel: message.channel,
-                            voiceChannel: message.member.voiceChannel,
-                            connection: null,
-                            songs: [...songs],
-                            volume: client.global.db.guilds[message.guild.id].defaultVolume,
-                            playing: true,
-                            looping: false
-                        };
-                        client.queue.set(message.guild.id, construct);
-                        message.channel.send(":white_check_mark: Queue set!");
-                        try {
-                            var connection = await message.member.voiceChannel.join();
-                            construct.connection = connection;
-                            client.funcs.play(message.guild, construct.songs[0], client, message, 0, false);
-                        } catch (error) {
-                            client.queue.delete(message.guild.id);
-                            return message.channel.send(`:x: An error occured: ${error}`);
-                        }
-                    } else {
-                        serverQueue.connection.dispatcher.end("queue set");
-                        serverQueue.songs = [...client.global.db.playlists[message.guild.id].songs];
-                        message.channel.send(":white_check_mark: Queue set!");
-                    }
-                } else return message.channel.send(':x: There is no queue set for this server!')
-            } else if (args[1] === 'save') {
-                if (!serverQueue) return message.channel.send(':x: There is nothing playing!');
-                client.global.db.playlists[message.guild.id] = {
-                    songs: serverQueue.songs,
-                    firstSong: serverQueue.songs[0],
-                    saved: true,
-                };
-                message.channel.send(":white_check_mark: Queue saved!");
-            } else if (args[1] === 'add') {
-                if (client.global.db.playlists[message.guild.id].saved) {
-                    const youtube = new YouTube(client.config.apikey);
-                    const searchString = args.slice(2).join(" ");
-                    const url = args[2] ? args[2].replace(/<(.+)>/g, "$1") : "";
-                    if (!args[2]) return message.channel.send(':x: You need to use a link or search for a song!');
-                    try {
-                        var video = await youtube.getVideo(url);
-                    } catch (error) {
-                        try {
-                            var videos = await youtube.searchVideos(searchString, 10);
-                            let index = 0;
-                            const embed = new Discord.RichEmbed()
-                                .setTitle("__Song Selection__")
-                                .setDescription(`${videos.map(video2 => `**${++index}** ${he.decode(video2.title)} `).join('\n')}`)
-                                .setFooter("Please provide a number ranging from 1-10 to select one of the search results.")
-                                .setColor("#b50002")
-                            message.channel.send(embed);
-                            try {
-                                var response = await message.channel.awaitMessages(message2 => message2.content > 0 && message2.content < 11, {
-                                    maxMatches: 1,
-                                    time: 10000,
-                                    errors: ['time']
-                                });
-                            } catch (err) {
-                                console.error(err);
-                                return message.channel.send(':x: Cancelling video selection');
-                            }
-                            const videoIndex = parseInt(response.first().content);
-                            var video = await youtube.getVideoByID(videos[videoIndex - 1].id);
-                        } catch (err) {
-                            console.error(err);
-                            return message.channel.send(':x: I could not obtain any search results!');
-                        }
-                    }
-                    let song = {
-                        id: video.id,
-                        title: Discord.Util.escapeMarkdown(video.title),
-                        url: `https://www.youtube.com/watch?v=${video.id}`
-                    }
-                    client.global.db.playlists[message.guild.id].songs.push(song);
-                    message.channel.send(`:white_check_mark: ${song.title} added to the playlist!`);
-                } else return message.channel.send(':x: There is no playlist saved! Start by using the save option!')
-            } else if (args[1] === 'remove') {
-                if (client.global.db.playlists[message.guild.id].saved) {
-                    if (!args[2]) return message.channel.send(':x: Please provide a number on the position of the song that you wan\'t to remove!');
-                    const songNum = parseInt(args[2]) - 1;
-                    if (isNaN(songNum)) return message.channel.send(':x: You need to enter a __number__!');
-                    if (songNum === 0) return message.channel.send(':x: You can not remove the currently playing song!');
-                    if (parseInt(songNum) > client.global.db.playlists[message.guild.id].songs.size) return message.channel.send(`:x: There is only ${serverQueue.songs.size} amount of songs in the queue!`);
-                    message.channel.send(`🗑️ removed \`${client.global.db.playlists[message.guild.id].songs[songNum].title}\` from the playlist!`);
-                    return client.global.db.playlists[message.guild.id].songs.splice(songNum, 1);
-                } else return message.channel.send(':x: There is no playlist saved! Start by using the save option!')
-            } else if (args[1] === 'list') {
-                if (args[2]) {
-                    if (isNaN(args[2])) return msg.channel.send(':x: I\'m sorry, But you need to enter a valid __number__.');
-                }
-                let page = parseInt(args[2]);
-                if (!page) page = 1;
-                let pagetext = `:page_facing_up: Page: ${page} :page_facing_up:`
-                let queuesongs = client.global.db.playlists[message.guild.id].songs.slice((page - 1) * 20, page * 20);
-                let queuemessage = `${queuesongs.map(song => `**#** ${song.title}`).join('\n')}`
-                const hashs = queuemessage.split('**#**').length;
-                for (let i = 0; i < hashs; i++) {
-                    queuemessage = queuemessage.replace('**#**', `**${i + 1}**`);
-                }
-                const embed = new Discord.RichEmbed()
-                    .setTitle("__playlist queue__")
-                    .setDescription(`${pagetext}\n${queuemessage}`)
-                    .setColor("#b50002")
-                return message.channel.send(embed);
             } else {
-                const embed = new Discord.RichEmbed()
-                    .setTitle('Options for playlist!')
-                    .addField('play', 'Play the guild specific queue.', true)
-                    .addField('save', 'Save the currently playing queue. Note that this will overwrite the currently saved queue!', true)
-                    .addField('add', 'Add songs to the playlist. Like song selection', true)
-                    .addField('remove', 'Remove songs from the playlist.', true)
-                    .addField('list', 'Display the playlist.', true)
-                    .setFooter(`how to use: ${prefix}playlist <Option> <Optional option>`)
-                    .setAuthor(client.user.username, client.user.displayAvatarURL)
-                    .setColor('#b50002')
                 return message.channel.send(embed);
             }
         } else return message.channel.send(":x: This is not a premium guild!");
diff --git a/commands/playlist/add.js b/commands/playlist/add.js
new file mode 100644
index 00000000..4b1b3d41
--- /dev/null
+++ b/commands/playlist/add.js
@@ -0,0 +1,51 @@
+const YouTube = require("simple-youtube-api");
+const he = require('he');
+
+module.exports = {
+    name: 'add',
+    async execute(message, args, client, Discord, prefix) {
+        if (client.global.db.playlists[message.guild.id].saved) {
+            const serverQueue = client.queue.get(message.guild.id);
+            const youtube = new YouTube(client.config.apikey);
+            const searchString = args.slice(2).join(" ");
+            const url = args[2] ? args[2].replace(/<(.+)>/g, "$1") : "";
+            if (!args[2]) return message.channel.send(':x: You need to use a link or search for a song!');
+            try {
+                var video = await youtube.getVideo(url);
+            } catch (error) {
+                try {
+                    var videos = await youtube.searchVideos(searchString, 10);
+                    let index = 0;
+                    const embed = new Discord.RichEmbed()
+                        .setTitle("__Song Selection__")
+                        .setDescription(`${videos.map(video2 => `**${++index}** ${he.decode(video2.title)} `).join('\n')}`)
+                        .setFooter("Please provide a number ranging from 1-10 to select one of the search results.")
+                        .setColor("#b50002")
+                    message.channel.send(embed);
+                    try {
+                        var response = await message.channel.awaitMessages(message2 => message2.content > 0 && message2.content < 11, {
+                            maxMatches: 1,
+                            time: 10000,
+                            errors: ['time']
+                        });
+                    } catch (err) {
+                        console.error(err);
+                        return message.channel.send(':x: Cancelling video selection');
+                    }
+                    const videoIndex = parseInt(response.first().content);
+                    var video = await youtube.getVideoByID(videos[videoIndex - 1].id);
+                } catch (err) {
+                    console.error(err);
+                    return message.channel.send(':x: I could not obtain any search results!');
+                }
+            }
+            let song = {
+                id: video.id,
+                title: Discord.Util.escapeMarkdown(video.title),
+                url: `https://www.youtube.com/watch?v=${video.id}`
+            }
+            client.global.db.playlists[message.guild.id].songs.push(song);
+            message.channel.send(`:white_check_mark: ${song.title} added to the playlist!`);
+        } else return message.channel.send(':x: There is no playlist saved! Start by using the save option!');
+    }
+};
\ No newline at end of file
diff --git a/commands/playlist/list.js b/commands/playlist/list.js
new file mode 100644
index 00000000..e737d697
--- /dev/null
+++ b/commands/playlist/list.js
@@ -0,0 +1,22 @@
+module.exports = {
+    name: 'list',
+    async execute(message, args, client, Discord, prefix) {
+        if (args[2]) {
+            if (isNaN(args[2])) return msg.channel.send(':x: I\'m sorry, But you need to enter a valid __number__.');
+        }
+        let page = parseInt(args[2]);
+        if (!page) page = 1;
+        let pagetext = `:page_facing_up: Page: ${page} :page_facing_up:`
+        let queuesongs = client.global.db.playlists[message.guild.id].songs.slice((page - 1) * 20, page * 20);
+        let queuemessage = `${queuesongs.map(song => `**#** ${song.title}`).join('\n')}`
+        const hashs = queuemessage.split('**#**').length;
+        for (let i = 0; i < hashs; i++) {
+            queuemessage = queuemessage.replace('**#**', `**${i + 1}**`);
+        }
+        const embed = new Discord.RichEmbed()
+            .setTitle("__playlist queue__")
+            .setDescription(`${pagetext}\n${queuemessage}`)
+            .setColor("#b50002")
+        return message.channel.send(embed);
+    }
+};
\ No newline at end of file
diff --git a/commands/playlist/play.js b/commands/playlist/play.js
new file mode 100644
index 00000000..ab33f8c7
--- /dev/null
+++ b/commands/playlist/play.js
@@ -0,0 +1,51 @@
+module.exports = {
+    name: 'play',
+    async execute(message, args, client, Discord, prefix) {
+        const serverQueue = client.queue.get(message.guild.id);
+        const voiceChannel = message.member.voiceChannel;
+        if (!voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in a voice channel to play music!');
+        const permissions = voiceChannel.permissionsFor(message.client.user);
+        if (!permissions.has('CONNECT')) {
+            return message.channel.send(':x: I cannot connect to your voice channel, make sure I have the proper permissions!');
+        }
+        if (!permissions.has('SPEAK')) {
+            return message.channel.send(':x: I cannot speak in your voice channel, make sure I have the proper permissions!');
+        }
+        let songs;
+        if (!voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in a voice channel to play music!');
+        if (args[2]) {
+            if (client.global.db.guilds[args[2]].premium && client.global.db.playlists[args[2]].saved) {
+                songs = client.global.db.playlists[args[2]].songs;
+            } else return message.channel.send(':x: There is no queue saved for this guild!')
+        } else {
+            songs = client.global.db.playlists[message.guild.id].songs;
+        }
+        if (client.global.db.playlists[message.guild.id].saved) {
+            if (!serverQueue) {
+                const construct = {
+                    textChannel: message.channel,
+                    voiceChannel: message.member.voiceChannel,
+                    connection: null,
+                    songs: [...songs],
+                    volume: client.global.db.guilds[message.guild.id].defaultVolume,
+                    playing: true,
+                    looping: false
+                };
+                client.queue.set(message.guild.id, construct);
+                message.channel.send(":white_check_mark: Queue set!");
+                try {
+                    var connection = await message.member.voiceChannel.join();
+                    construct.connection = connection;
+                    client.funcs.play(message.guild, construct.songs[0], client, message, 0, false);
+                } catch (error) {
+                    client.queue.delete(message.guild.id);
+                    return message.channel.send(`:x: An error occured: ${error}`);
+                }
+            } else {
+                serverQueue.connection.dispatcher.end("queue set");
+                serverQueue.songs = [...client.global.db.playlists[message.guild.id].songs];
+                message.channel.send(":white_check_mark: Queue set!");
+            }
+        } else return message.channel.send(':x: There is no queue set for this server!')
+    }
+};
\ No newline at end of file
diff --git a/commands/playlist/remove.js b/commands/playlist/remove.js
new file mode 100644
index 00000000..d69f4ca9
--- /dev/null
+++ b/commands/playlist/remove.js
@@ -0,0 +1,14 @@
+module.exports = {
+    name: 'remove',
+    async execute(message, args, client, Discord, prefix) {
+        if (client.global.db.playlists[message.guild.id].saved) {
+            if (!args[2]) return message.channel.send(':x: Please provide a number on the position of the song that you wan\'t to remove!');
+            const songNum = parseInt(args[2]) - 1;
+            if (isNaN(songNum)) return message.channel.send(':x: You need to enter a __number__!');
+            if (songNum === 0) return message.channel.send(':x: You can not remove the currently playing song!');
+            if (parseInt(songNum) > client.global.db.playlists[message.guild.id].songs.size) return message.channel.send(`:x: There is only ${serverQueue.songs.size} amount of songs in the queue!`);
+            message.channel.send(`🗑️ removed \`${client.global.db.playlists[message.guild.id].songs[songNum].title}\` from the playlist!`);
+            return client.global.db.playlists[message.guild.id].songs.splice(songNum, 1);
+        } else return message.channel.send(':x: There is no playlist saved! Start by using the save option!');
+    }
+};
\ No newline at end of file
diff --git a/commands/playlist/save.js b/commands/playlist/save.js
new file mode 100644
index 00000000..ec256171
--- /dev/null
+++ b/commands/playlist/save.js
@@ -0,0 +1,13 @@
+module.exports = {
+    name: 'save',
+    async execute(message, args, client, Discord, prefix) {
+        const serverQueue = client.queue.get(message.guild.id);
+        if (!serverQueue) return message.channel.send(':x: There is nothing playing!');
+        client.global.db.playlists[message.guild.id] = {
+            songs: serverQueue.songs,
+            firstSong: serverQueue.songs[0],
+            saved: true,
+        };
+        message.channel.send(":white_check_mark: Queue saved!");
+    }
+};
\ No newline at end of file
diff --git a/commands/queue.js b/commands/queue.js
index ee581e17..44fcb865 100644
--- a/commands/queue.js
+++ b/commands/queue.js
@@ -1,6 +1,7 @@
 module.exports = {
 	name: 'queue',
 	description: 'Queue command.',
+	alias: 'q',
 	cooldown: 5,
 	async execute(message, args, client, Discord, prefix) {
 		const serverQueue = client.queue.get(message.guild.id);
diff --git a/commands/remove.js b/commands/remove.js
index a0c42e32..e4be9583 100644
--- a/commands/remove.js
+++ b/commands/remove.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'remove',
     description: 'Remove command.',
+    alias: 'rm',
     cooldown: 5,
     execute(message, args, client, Discord, prefix) {
         const { voiceChannel } = message.member;
@@ -12,7 +13,7 @@ module.exports = {
         if (isNaN(pos)) return message.channel.send(':x: You need to enter a number!');
         if (pos === 0) return message.channel.send(':x: You can not remove the currently playing song!');
         if (pos > serverQueue.songs.size) return message.channel.send(`:x: There is only ${serverQueue.songs.size} amount of songs in the queue!`);
-        if (message.author.id !== '360363051792203779') {
+        if (message.author.id !== client.global.devId) {
             if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to remove songs!');
             if (client.global.db.guilds[message.guild.id].dj) {
                 if (serverQueue.songs[pos].author !== message.author) {
diff --git a/commands/resume.js b/commands/resume.js
index 122cd66c..152d9c75 100644
--- a/commands/resume.js
+++ b/commands/resume.js
@@ -1,13 +1,14 @@
 module.exports = {
 	name: 'resume',
 	description: 'Resume command.',
+	alias: 'resume',
 	cooldown: 5,
 	execute(message, args, client, Discord, prefix) {
 		const serverQueue = client.queue.get(message.guild.id);
 		const permissions = message.channel.permissionsFor(message.author);
 		const { voiceChannel } = message.member;
 		if (serverQueue && !serverQueue.playing) {
-			if (message.author.id !== '360363051792203779') {
+			if (message.author.id !== client.global.devId) {
 				if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to loop the queue!');
 				if (client.global.db.guilds[message.guild.id].permissions === true) {
 					if (client.global.db.guilds[message.guild.id].dj) {
diff --git a/commands/seek.js b/commands/seek.js
index 2cf4e2ce..e7b03d9d 100644
--- a/commands/seek.js
+++ b/commands/seek.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'seek',
     description: 'seek command.',
+    alias: 'seek',
     cooldown: 10,
     async execute(message, args, client, Discord, prefix) {
         const ytdl = require('ytdl-core');
@@ -9,7 +10,7 @@ module.exports = {
         const { voiceChannel } = message.member;
         let data = await Promise.resolve(ytdl.getInfo(serverQueue.songs[0].url));
         if (serverQueue) {
-            if (message.author.id !== '360363051792203779') {
+            if (message.author.id !== client.global.devId) {
                 return message.channel.send(':x: This command is currently disabled!');
                 if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to seek the song!');
                 if (client.global.db.guilds[message.guild.id].permissions === true) {
diff --git a/commands/settings.js b/commands/settings.js
index 58041dcd..c5022aec 100644
--- a/commands/settings.js
+++ b/commands/settings.js
@@ -2,106 +2,39 @@ module.exports = {
   name: 'settings',
   usage: '[setting]',
   description: 'Change the settings',
+  alias: 'settings',
   cooldown: 10,
   async execute(message, args, client, Discord, prefix) {
+    const embed = new Discord.RichEmbed()
+      .setTitle('Guild settings for Musix')
+      .addField('prefix', 'Change the guild specific prefix. (string)', true)
+      .addField('volume', 'Change the default volume that the bot will start playing at. (number)', true)
+      .addField('permissions', 'Change whether to require permissions to use eg `skip, stop, pause, loop, etc...`', true)
+      .addField('setdj', 'Set a DJ role. This will allow chosen users to freely use all Musix commands. This will automatically set the `permissions` settings to true in order for the `DJ` role to have effect!', true)
+      .addField('announcesongs', 'Whether to announce songs that start playing or not.')
+      .setFooter(`how to use: ${prefix}settings <Setting name> <value>`)
+      .setAuthor(client.user.username, client.user.displayAvatarURL)
+      .setColor('#b50002')
     const permissions = message.channel.permissionsFor(message.author);
-    if (message.author.id !== '360363051792203779') {
+    if (message.author.id !== client.config.devId) {
       if (!permissions.has('MANAGE_GUILD')) return message.channel.send(':x: You need the `MANAGE_SERVER` permission to change the settings!');
     }
-    if (args[1] === 'prefix') {
-      if (!args[2]) return message.channel.send(`<:thonk:461691390972264449> Current prefix: \`${client.global.db.guilds[message.guild.id].prefix}\``);
-      client.global.db.guilds[message.guild.id].prefix = args[2];
-      message.channel.send(`:white_check_mark: New prefix set to: \`${args[2]}\``);
-    } else if (args[1] === 'volume') {
-      if (!args[2]) return message.channel.send(`:speaker: Current default volume is: \`${client.global.db.guilds[message.guild.id].defaultVolume}\``);
-      if (isNaN(args[2])) return message.channel.send(':x: I\'m sorry, But the default volume needs to be a valid __number__.');
-      if (args[2].length > 2) return message.channel.send(':x: The default volume must be below `100` for quality and safety resons.');
-      client.global.db.guilds[message.guild.id].defaultVolume = args[2];
-      message.channel.send(`:white_check_mark: Default volume set to: \`${args[2]}\``);
-    } else if (args[1] === 'permissions') {
-      if (!args[2]) return message.channel.send(`🔒 Permission requirement: \`${client.global.db.guilds[message.guild.id].permissions}\``);
-      if (args[2] === 'true') {
-        if (!client.global.db.guilds[message.guild.id].permissions) {
-          client.global.db.guilds[message.guild.id].permissions = true;
-          message.channel.send(`:white_check_mark: Permissions requirement now set to: \`true\``);
-        } else return message.channel.send(':x: That value is already `true`!');
-      } else if (args[2] === 'false') {
-        if (client.global.db.guilds[message.guild.id].permissions) {
-          client.global.db.guilds[message.guild.id].permissions = false;
-          message.channel.send(`:white_check_mark: Permissions requirement now set to: \`false\``);
-        } else return message.channel.send(':x: That value is already `false`!');
-      } else return message.channel.send(':x: Please define a boolean! (true/false)');
-    } else if (args[1] === 'setpremium' && message.author.id === '360363051792203779') {
-      if (args[2]) {
-        const guild = client.guilds.get(args[2]);
-        if (!client.global.db.guilds[guild.id].premium) {
-          client.global.db.playlists[guild.id] = {
-            songs: [],
-            firstSong: undefined,
-            saved: false,
-          };
-          client.global.db.guilds[guild.id].premium = true;
-          message.channel.send(`:white_check_mark: Guild ${guild.name} | ${guild.id} is now premium! :tada:`)
-        } else {
-          client.global.db.guilds[guild.id].premium = false;
-          message.channel.send(`:white_check_mark: Guild ${guild.name} | ${guild.id} is no longer premium!`)
-        }
-      } else {
-        if (!client.global.db.guilds[message.guild.id].premium) {
-          client.global.db.playlists[message.guild.id] = {
-            songs: [],
-            firstSong: undefined,
-            saved: false,
-          };
-          client.global.db.guilds[message.guild.id].premium = true;
-          message.channel.send(':white_check_mark: This guild is now premium! :tada:')
-        } else {
-          client.global.db.guilds[message.guild.id].premium = false;
-          message.channel.send(":white_check_mark: This guild is no longer premium!")
-        }
-      }
-    } else if (args[1] === "setdj") {
-      if (!client.global.db.guilds[message.guild.id].dj) {
-        if (!client.global.db.guilds[message.guild.id].permissions) {
-          client.global.db.guilds[message.guild.id].permissions = true;
-        }
-        client.global.db.guilds[message.guild.id].dj = true;
-        if (message.guild.roles.find(x => x.name === "DJ")) {
-          client.global.db.guilds[message.guild.id].djrole = message.guild.roles.find(x => x.name === "DJ").id;
-          message.channel.send(':white_check_mark: I found a `DJ` role from this guild! This role is now the DJ role.');
-        } else {
-          const permissions = message.channel.permissionsFor(message.client.user);
-          if (!permissions.has('MANAGE_ROLES')) return message.channel.send(':x: I cannot create roles (Manage roles), make sure I have the proper permissions! I will need this permission to create a `DJ` role since i did not find one!');
-          message.guild.createRole({
-            name: 'DJ',
-          })
-            .then(role => client.global.db.guilds[message.guild.id].djrole = role.id)
-            .catch(console.error)
-          message.channel.send(':white_check_mark: I did not find a role `DJ` so i have created one for you!');
-        }
-      } else {
-        client.global.db.guilds[message.guild.id].dj = false;
-        message.channel.send(':white_check_mark: `DJ` now set to `false`');
-      }
-    } else if (args[1] === 'announcesongs') {
-      if (client.global.db.guilds[message.guild.id].startPlaying) {
-        client.global.db.guilds[message.guild.id].startPlaying = false;
-        return message.channel.send(':white_check_mark: announcesongs now set to `false`!');
-      } else {
-        client.global.db.guilds[message.guild.id].startPlaying = true;
-        return message.channel.send(':white_check_mark: announcesongs now set to `true`!');
+    if (args[1]) {
+      const optionName = args[1].toLowerCase();
+      const option = client.settingCmd.get(optionName) || client.settingCmd.find(cmd => cmd.aliases && cmd.aliases.includes(optionName));
+      if (!option) return message.channel.send(embed);
+      try {
+        option.execute(message, args, client, Discord, prefix);
+      } catch (error) {
+        message.reply(`:x: there was an error trying to execute that option! Please contact support with \`${prefix}bug\`!`);
+        const embed = new Discord.RichEmbed()
+          .setTitle(`Musix ${error.toString()}`)
+          .setDescription(error.stack.replace(/at /g, '**at **'))
+          .setColor('#b50002');
+        client.fetchUser(client.config.devId).then(user => user.send(embed)).catch(console.error);
+        client.channels.get('634718645188034560').send(embed);
       }
     } else {
-      const embed = new Discord.RichEmbed()
-        .setTitle('Guild settings for Musix')
-        .addField('prefix', 'Change the guild specific prefix. (string)', true)
-        .addField('volume', 'Change the default volume that the bot will start playing at. (number)', true)
-        .addField('permissions', 'Change whether to require permissions to use eg `skip, stop, pause, loop, etc...`', true)
-        .addField('setdj', 'Set a DJ role. This will allow chosen users to freely use all Musix commands. This will automatically set the `permissions` settings to true in order for the `DJ` role to have effect!', true)
-        .addField('announcesongs', 'Whether to announce songs that start playing or not.')
-        .setFooter(`how to use: ${prefix}settings <Setting name> <value>`)
-        .setAuthor(client.user.username, client.user.displayAvatarURL)
-        .setColor('#b50002')
       return message.channel.send(embed);
     }
   },
diff --git a/commands/settings/announcesongs.js b/commands/settings/announcesongs.js
new file mode 100644
index 00000000..f871d78a
--- /dev/null
+++ b/commands/settings/announcesongs.js
@@ -0,0 +1,12 @@
+module.exports = {
+    name: 'announcesongs',
+    async execute(message, args, client, Discord, prefix) {
+        if (client.global.db.guilds[message.guild.id].startPlaying) {
+            client.global.db.guilds[message.guild.id].startPlaying = false;
+            return message.channel.send(':white_check_mark: announcesongs now set to `false`!');
+        } else {
+            client.global.db.guilds[message.guild.id].startPlaying = true;
+            return message.channel.send(':white_check_mark: announcesongs now set to `true`!');
+        }
+    }
+};
\ No newline at end of file
diff --git a/commands/settings/permissions.js b/commands/settings/permissions.js
new file mode 100644
index 00000000..b78f7673
--- /dev/null
+++ b/commands/settings/permissions.js
@@ -0,0 +1,17 @@
+module.exports = {
+    name: 'permissions',
+    async execute(message, args, client, Discord, prefix) {
+        if (!args[2]) return message.channel.send(`🔒 Permission requirement: \`${client.global.db.guilds[message.guild.id].permissions}\``);
+        if (args[2] === 'true') {
+            if (!client.global.db.guilds[message.guild.id].permissions) {
+                client.global.db.guilds[message.guild.id].permissions = true;
+                message.channel.send(`:white_check_mark: Permissions requirement now set to: \`true\``);
+            } else return message.channel.send(':x: That value is already `true`!');
+        } else if (args[2] === 'false') {
+            if (client.global.db.guilds[message.guild.id].permissions) {
+                client.global.db.guilds[message.guild.id].permissions = false;
+                message.channel.send(`:white_check_mark: Permissions requirement now set to: \`false\``);
+            } else return message.channel.send(':x: That value is already `false`!');
+        } else return message.channel.send(':x: Please define a boolean! (true/false)');
+    }
+};
\ No newline at end of file
diff --git a/commands/settings/prefix.js b/commands/settings/prefix.js
new file mode 100644
index 00000000..801ac114
--- /dev/null
+++ b/commands/settings/prefix.js
@@ -0,0 +1,8 @@
+module.exports = {
+    name: 'prefix',
+    async execute(message, args, client, Discord, prefix) {
+        if (!args[2]) return message.channel.send(`Current prefix: \`${client.global.db.guilds[message.guild.id].prefix}\``);
+        client.global.db.guilds[message.guild.id].prefix = args[2];
+        message.channel.send(`:white_check_mark: New prefix set to: \`${args[2]}\``);
+    }
+};
\ No newline at end of file
diff --git a/commands/settings/setDj.js b/commands/settings/setDj.js
new file mode 100644
index 00000000..19c67d4e
--- /dev/null
+++ b/commands/settings/setDj.js
@@ -0,0 +1,27 @@
+module.exports = {
+    name: 'setdj',
+    async execute(message, args, client, Discord, prefix) {
+        if (!client.global.db.guilds[message.guild.id].dj) {
+            if (!client.global.db.guilds[message.guild.id].permissions) {
+                client.global.db.guilds[message.guild.id].permissions = true;
+            }
+            client.global.db.guilds[message.guild.id].dj = true;
+            if (message.guild.roles.find(x => x.name === "DJ")) {
+                client.global.db.guilds[message.guild.id].djrole = message.guild.roles.find(x => x.name === "DJ").id;
+                message.channel.send(':white_check_mark: I found a `DJ` role from this guild! This role is now the DJ role.');
+            } else {
+                const permissions = message.channel.permissionsFor(message.client.user);
+                if (!permissions.has('MANAGE_ROLES')) return message.channel.send(':x: I cannot create roles (Manage roles), make sure I have the proper permissions! I will need this permission to create a `DJ` role since i did not find one!');
+                message.guild.createRole({
+                    name: 'DJ',
+                })
+                    .then(role => client.global.db.guilds[message.guild.id].djrole = role.id)
+                    .catch(console.error)
+                message.channel.send(':white_check_mark: I did not find a role `DJ` so i have created one for you!');
+            }
+        } else {
+            client.global.db.guilds[message.guild.id].dj = false;
+            message.channel.send(':white_check_mark: `DJ` now set to `false`');
+        }
+    }
+};
\ No newline at end of file
diff --git a/commands/settings/setpremium.js b/commands/settings/setpremium.js
new file mode 100644
index 00000000..8ead23f1
--- /dev/null
+++ b/commands/settings/setpremium.js
@@ -0,0 +1,34 @@
+module.exports = {
+    name: 'setpremium',
+    async execute(message, args, client, Discord, prefix) {
+        if (message.author.id !== client.config.devId) return;
+        if (args[2]) {
+            const guild = client.guilds.get(args[2]);
+            if (!client.global.db.guilds[guild.id].premium) {
+                client.global.db.playlists[guild.id] = {
+                    songs: [],
+                    firstSong: undefined,
+                    saved: false,
+                };
+                client.global.db.guilds[guild.id].premium = true;
+                message.channel.send(`:white_check_mark: Guild ${guild.name} | ${guild.id} is now premium! :tada:`)
+            } else {
+                client.global.db.guilds[guild.id].premium = false;
+                message.channel.send(`:white_check_mark: Guild ${guild.name} | ${guild.id} is no longer premium!`)
+            }
+        } else {
+            if (!client.global.db.guilds[message.guild.id].premium) {
+                client.global.db.playlists[message.guild.id] = {
+                    songs: [],
+                    firstSong: undefined,
+                    saved: false,
+                };
+                client.global.db.guilds[message.guild.id].premium = true;
+                message.channel.send(':white_check_mark: This guild is now premium! :tada:')
+            } else {
+                client.global.db.guilds[message.guild.id].premium = false;
+                message.channel.send(":white_check_mark: This guild is no longer premium!")
+            }
+        }
+    }
+};
\ No newline at end of file
diff --git a/commands/settings/volume.js b/commands/settings/volume.js
new file mode 100644
index 00000000..d2bd8cf0
--- /dev/null
+++ b/commands/settings/volume.js
@@ -0,0 +1,10 @@
+module.exports = {
+    name: 'volume',
+    async execute(message, args, client, Discord, prefix) {
+        if (!args[2]) return message.channel.send(`:speaker: Current default volume is: \`${client.global.db.guilds[message.guild.id].defaultVolume}\``);
+        if (isNaN(args[2])) return message.channel.send(':x: I\'m sorry, But the default volume needs to be a valid __number__.');
+        if (args[2].length > 2) return message.channel.send(':x: The default volume must be below `100` for quality and safety resons.');
+        client.global.db.guilds[message.guild.id].defaultVolume = args[2];
+        message.channel.send(`:white_check_mark: Default volume set to: \`${args[2]}\``);
+    }
+};
\ No newline at end of file
diff --git a/commands/skip.js b/commands/skip.js
index 3f4c9ad2..3a782988 100644
--- a/commands/skip.js
+++ b/commands/skip.js
@@ -1,13 +1,14 @@
 module.exports = {
 	name: 'skip',
 	description: 'Skip command.',
+	alias: 'skip',
 	cooldown: 5,
 	execute(message, args, client, Discord, prefix) {
 		const { voiceChannel } = message.member;
 		const serverQueue = client.queue.get(message.guild.id);
 		const permissions = message.channel.permissionsFor(message.author);
 		if (!serverQueue) return message.channel.send(':x: There is nothing playing that I could skip for you.');
-		if (message.author.id !== '360363051792203779') {
+		if (message.author.id !== client.config.devId) {
 			if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to skip the song!');
 			if (client.global.db.guilds[message.guild.id].permissions === true) {
 				if (client.global.db.guilds[message.guild.id].dj) {
diff --git a/commands/status.js b/commands/status.js
index 0948fcaa..be07197b 100644
--- a/commands/status.js
+++ b/commands/status.js
@@ -1,6 +1,7 @@
 module.exports = {
     name: 'status',
     description: 'Status command.',
+    alias: 'status',
     cooldown: 5,
     execute(message, args, client, Discord, prefix) {
         let rawUptime = client.uptime;
diff --git a/commands/stop.js b/commands/stop.js
index 37d8054f..49edb389 100644
--- a/commands/stop.js
+++ b/commands/stop.js
@@ -1,12 +1,13 @@
 module.exports = {
 	name: 'stop',
 	description: 'Stop command.',
+	alias: 'stop',
 	cooldown: 5,
 	execute(message, args, client, Discord, prefix) {
 		const { voiceChannel } = message.member;
 		const serverQueue = client.queue.get(message.guild.id);
-		const permissions = message.channel.permissionsFor(message.author);	
-		if (message.author.id !== '360363051792203779') {
+		const permissions = message.channel.permissionsFor(message.author);
+		if (message.author.id !== client.config.devId) {
 			if (!serverQueue) return message.channel.send(':x: There is nothing playing that I could stop for you.');
 			if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to stop the music!');
 			if (client.global.db.guilds[message.guild.id].permissions === true) {
diff --git a/commands/volume.js b/commands/volume.js
index a2c1f80c..50890cd2 100644
--- a/commands/volume.js
+++ b/commands/volume.js
@@ -1,6 +1,7 @@
 module.exports = {
 	name: 'volume',
 	description: 'Volume command.',
+	alias: 'volume',
 	cooldown: 5,
 	execute(message, args, client, Discord, prefix) {
 		const { voiceChannel } = message.member;
@@ -10,7 +11,7 @@ module.exports = {
 		if (!serverQueue) return message.channel.send(':x: There is nothing playing.');
 		if (!args[1]) return message.channel.send(`:loud_sound: The current volume is: **${serverQueue.volume}**`);
 		const volume = parseFloat(args[1]);
-		if (message.author.id !== '360363051792203779') {
+		if (message.author.id !== client.config.devId) {
 			if (!voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in a voice channel to change the volume!');
 			if (client.global.db.guilds[message.guild.id].permissions === true) {
 				if (client.global.db.guilds[message.guild.id].dj) {
diff --git a/events/message.js b/events/message.js
index 03275ed7..dc18f6e6 100644
--- a/events/message.js
+++ b/events/message.js
@@ -2,66 +2,47 @@ module.exports = {
     name: 'message',
     async execute(client, message, Discord) {
         if (message.author.bot || !message.guild) return;
-        if (message.content === '->reset' && message.author.id === '360363051792203779') {
+        if (message.content === '->reset' && message.author.id === client.global.devId) {
             client.guilds.forEach(guild => {
                 client.global.db.guilds[guild.id] = {
-                    prefix: ">",
+                    prefix: client.config.prefix,
                     defaultVolume: 5,
                     permissions: false,
                     premium: false,
                     dj: false,
                     djrole: null
                 };
+                return message.channel.send(':white_check_mark: Reset all guild settings for __all__ guilds!');
             });
             return message.channel.send(':white_check_mark: Reset all guild settings!')
-        } else if (message.content === '->resetguildsettings' && message.author.id === '360363051792203779') {
+        } else if (message.content === '->resetguildsettings' && message.author.id === client.global.devId) {
             client.global.db.guilds[message.guild.id] = {
-                prefix: ">",
+                prefix: client.config.prefix,
                 defaultVolume: 5,
                 permissions: false,
                 premium: false,
                 dj: false,
                 djrole: null
             };
+            return message.channel.send(':white_check_mark: Reset all guild settings for this guild!');
         }
         let prefix = client.global.db.guilds[message.guild.id].prefix;
         const args = message.content.slice(prefix.length).split(' ');
+        let commandName;
         if (message.mentions.users.first()) {
-            if (message.mentions.users.first().id === '607266889537945605' && args[1] === 'help') return client.commands.get('help').execute(message, args, client, Discord, prefix, client);
-            if (message.mentions.users.first().id === '607266889537945605' && args[1] === 'prefix') return message.channel.send(`My prefix here is: \`${prefix}\`.`);
+            if (message.mentions.users.first().id === client.config.botId) {
+                if (!args[1]) return;
+                if (args[1] === 'prefix') return message.channel.send(`My prefix here is: \`${prefix}\`.`);
+                commandName = args[1].toLowerCase();
+                const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
+                client.funcs.exe(message, args, client, Discord, prefix, command);
+            }
         }
         if (!message.content.startsWith(prefix)) return;
         if (!args[0]) return;
-        let commandName = args[0].toLowerCase();
-        if (commandName === `p`) {
-            commandName = 'play';
-        }
-        if (commandName === 'q') {
-            commandName = 'queue';
-        }
-        if (commandName === 's') {
-            commandName = 'skip';
-        }
-        if (commandName === 'np') {
-            commandName = 'nowplaying';
-        }
-        if (commandName === 'rm') {
-            commandName = 'remove';
-        }
-        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
-        const permissions = message.channel.permissionsFor(message.client.user);
-        if (!permissions.has('EMBED_LINKS')) return message.channel.send(':x: I cannot send embeds (Embed links), make sure I have the proper permissions!');
+        commandName = args[0].toLowerCase();
+        const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
         if (!command && message.content !== `${prefix}`) return;
-        try {
-            command.execute(message, args, client, Discord, prefix);
-        } catch (error) {
-            message.reply(`:x: there was an error trying to execute that command! Please contact support with \`${prefix}bug\`!`);
-            const embed = new Discord.RichEmbed()
-                .setTitle(`Musix ${error.toString()}`)
-                .setDescription(error.stack.replace(/at /g, '**at **'))
-                .setColor('#b50002');
-            client.fetchUser('360363051792203779').then(user => user.send(embed)).catch(console.error);
-            client.channels.get('634718645188034560').send(embed);
-        }
+        client.funcs.exe(message, args, client, Discord, prefix, command);
     }
 }
diff --git a/funcs/exe.js b/funcs/exe.js
new file mode 100644
index 00000000..632d180a
--- /dev/null
+++ b/funcs/exe.js
@@ -0,0 +1,15 @@
+module.exports = function (message, args, client, Discord, prefix, command) {
+    const permissions = message.channel.permissionsFor(message.client.user);
+    if (!permissions.has('EMBED_LINKS')) return message.channel.send(':x: I cannot send embeds (Embed links), make sure I have the proper permissions!');
+    try {
+        command.execute(message, args, client, Discord, prefix);
+    } catch (error) {
+        message.reply(`:x: there was an error trying to execute that command! Please contact support with \`${prefix}bug\`!`);
+        const embed = new Discord.RichEmbed()
+            .setTitle(`Musix ${error.toString()}`)
+            .setDescription(error.stack.replace(/at /g, '**at **'))
+            .setColor('#b50002');
+        client.fetchUser(client.global.devId).then(user => user.send(embed)).catch(console.error);
+        client.channels.get('634718645188034560').send(embed);
+    }
+};
\ No newline at end of file
diff --git a/index.js b/index.js
index 53adea2e..57b0aa7e 100644
--- a/index.js
+++ b/index.js
@@ -23,6 +23,9 @@ client.global = {
 };
 
 client.commands = new Discord.Collection();
+client.commandAliases = new Discord.Collection();
+client.playlistCmd = new Discord.Collection();
+client.settingCmd = new Discord.Collection();
 client.events = new Discord.Collection();
 client.cooldowns = new Discord.Collection();
 client.queue = new Map();
@@ -32,17 +35,21 @@ client.funcs.handleVideo = require('./funcs/handleVideo.js');
 client.funcs.play = require('./funcs/play.js');
 client.funcs.msToTime = require('./funcs/msToTime.js');
 client.funcs.dbget = require('./funcs/dbget.js');
+client.funcs.exe = require('./funcs/exe.js');
 
 client.config = {
   token: process.env.TOKEN,
   apikey: process.env.API_KEY,
+  botId: "607266889537945605",
+  devId: "360363051792203779",
   prefix: '>',
-  test: 'success',
 };
+
 const commandFiles = fs.readdirSync('./commands/').filter(f => f.endsWith('.js'));
 for (const file of commandFiles) {
   const command = require(`./commands/${file}`);
   client.commands.set(command.name, command);
+  client.commandAliases.set(command.alias, command);
 }
 const eventFiles = fs.readdirSync('./events/').filter(f => f.endsWith('.js'));
 for (const file of eventFiles) {
@@ -50,6 +57,18 @@ for (const file of eventFiles) {
   client.events.set(event.name, event);
 }
 
+const playlistFiles = fs.readdirSync('./commands/playlist/').filter(f => f.endsWith('.js'));
+for (const file of playlistFiles) {
+  const option = require(`./commands/playlist/${file}`);
+  client.playlistCmd.set(option.name, option);
+}
+
+const settingFiles = fs.readdirSync('./commands/settings/').filter(f => f.endsWith('.js'));
+for (const file of settingFiles) {
+  const option = require(`./commands/settings/${file}`);
+  client.settingCmd.set(option.name, option);
+}
+
 client.on('ready', async () => {
   const eventName = 'ready';
   const event = client.events.get(eventName) || client.events.find(ent => ent.aliases && ent.aliases.includes(eventName));