The Purification, v7.0.0

add:
- aesthetic, oddcase, stretch, surreal
- culturedtext
- dogeify
- howify
- insult
- lorem
- spongebob

Other Stuff:
- many refactoring

44 files changed, 526 insertions, 116 deletions

diff --git a/src/app.js b/src/app.ts
index ebcf388..a11d878 100644
--- a/src/app.js
+++ b/src/app.ts
@@ -1,5 +1,5 @@
-const { ShardingManager } = require('discord.js');
-const config = require('./config.json');
+import { ShardingManager } from 'discord.js';
+import config from './config.json';
 const manager = new ShardingManager('./dist/bot.js', { token: config['secret'] });
 //const manager = new ShardingManager('./bot.js', { token: config['secret'] });
 
diff --git a/src/bot.ts b/src/bot.ts
index 808ea31..2f3d8a3 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -2,11 +2,10 @@ import config from './config.json';
 import { CommandoClient } from 'discord.js-commando';
 //import WS  from './ws/ws';
 import path from 'path';
-import { Structures } from 'discord.js';
+import { Structures, MessageAttachment } from 'discord.js';
 import emoji from 'emoji-random';
 Structures.extend('Guild', Guild => {
     class MusicGuild extends Guild {
-        musicData: { queue: never[]; isPlaying: boolean; volume: number; songDispatcher: null; };
         constructor(client, data) {
             super(client, data);
             this.musicData = {
@@ -19,7 +18,7 @@ Structures.extend('Guild', Guild => {
     }
     return MusicGuild;
 });
-//
+
 const client = new CommandoClient({
     commandPrefix: 'uwu!',
     owner: '217348698294714370'
@@ -57,9 +56,10 @@ client.once('ready', () => {
     console.log('OS Version:', process.platform)
     console.log('Name:', `${client.user?.tag}`)
     console.log('ID:', `${client.user?.id}`)
+    console.log('Servers:', `${client.guilds.cache.size}`)
     console.log()
     
-    client.user.setActivity('uwu!help | v6.0.0', {
+    client.user.setActivity('uwu!help | v7.0.0', {
         type: 'WATCHING'
     });
 });
@@ -81,7 +81,7 @@ client.on('message', async msg => {
             console.log(msg.member.user.tag, 'says', msgContent, 'in #' + msg.channel.name + ' in ' + msg.guild.name);
         }
     }
-
+    
     if (msg.mentions.everyone) {
         msg.react(emoji.random());
     }
diff --git a/src/commands/fun/8ball.js b/src/commands/fun/8ball.ts
index 6be4f01..faf7adf 100644
--- a/src/commands/fun/8ball.js
+++ b/src/commands/fun/8ball.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const { MessageEmbed } = require('discord.js');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 
 module.exports = class EightBallFun extends Command {
 	constructor(client) {
@@ -24,10 +24,9 @@ module.exports = class EightBallFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
 		});
 	}
-	run(msg) {
+	run(msg: CommandoMessage) {
 		var r = ['Yes~ uwu', 'No.', 'Yes!', 'No!', 'What, no.', 'Yes.', 'Maybe.', 'Perhaps.', 'Try again.', 'I\'m not sure.'];
 		var s = r[Math.floor(Math.random() * r.length)];
-
 		let embed = new MessageEmbed()
 
 		    .setAuthor('The 8-ball says', 'https://upload.wikimedia.org/wikipedia/commons/thumb/f/fd/8-Ball_Pool.svg/500px-8-Ball_Pool.svg.png')
diff --git a/src/commands/fun/aesthetic.ts b/src/commands/fun/aesthetic.ts
new file mode 100644
index 0000000..54bde0c
--- /dev/null
+++ b/src/commands/fun/aesthetic.ts
@@ -0,0 +1,33 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import ct from 'culturedtext';
+import emoji from 'emoji-random';
+
+module.exports = class AestheticFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'aesthetic',
+            aliases: ['aestheticifize'],
+            group: 'fun',
+            memberName: 'aesthetic',
+            description: 'Aestheticifizes anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to aestheticifize?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!aesthetic please aestheticifize this'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = ct.aethstetic(m);
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/culturedtext.ts b/src/commands/fun/culturedtext.ts
new file mode 100644
index 0000000..499b3e6
--- /dev/null
+++ b/src/commands/fun/culturedtext.ts
@@ -0,0 +1,49 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import ct from 'culturedtext';
+import emoji from 'emoji-random';
+
+module.exports = class CulturedTextFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'culturedtext',
+            aliases: ['ct'],
+            group: 'fun',
+            memberName: 'culturedtext',
+            description: 'Cultured textifys anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to cultured textifys?',
+                    type: 'string'
+                },
+                {
+                    key: 'ctType',
+                    prompt: 'What type of cultured textification would you like to do? (oddcase, aesthetic, surreal or stretch)',
+                    type: 'string'
+                }
+                
+            ],
+            examples: [
+                'uwu!culturedtext oddcase please cultured textify this'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg, ctType }) {
+        var m = userMsg;
+        if (ctType == "oddcase" || ctType == 'o') {
+            var u1 = ct.oddcase(m + ' ' + emoji.random());
+        } else if (ctType == 'aesthetic' || ctType == 'a') {
+            var u1 = ct.aethstetic(m + ' ' + emoji.random());
+        } else if (ctType == 'surreal') {
+            var u1 = ct.surreal(m + ' ' + emoji.random());
+        } else if (ctType == 'stretch') {
+            var u1 = ct.stretched(m + ' ' + emoji.random());
+        } else {
+            msg.reply('That is not at option, please sellect a valid option.')
+        }
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/dm.ts b/src/commands/fun/dm.ts
new file mode 100644
index 0000000..73fa0b6
--- /dev/null
+++ b/src/commands/fun/dm.ts
@@ -0,0 +1,63 @@
+// TODO: remove mention from final msg
+
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
+
+module.exports = class DMFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'dm',
+            aliases: [
+                'directmessage',
+                'directmsg',
+                'direct-message',
+                'direct-msg'
+            ],
+            group: 'fun',
+            memberName: 'dm',
+            description: 'Allows you to DM somebody as the bot.',
+            guildOnly: true,
+            args: [
+                {
+                    key: 'msgContent',
+                    prompt: 'What message would you like to send?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!dm @sin#1337 hi',
+                'uwu!directmessage @sin#1337 hey',
+                'uwu!directmsg @sin#1337 hello',
+                'uwu!direct-message @sin#1337 yo',
+                'uwu!direct-msg @sin#1337 aye',
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'ADMINISTRATOR'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+        });
+    }
+    run(msg: CommandoMessage, { msgContent }) {
+        if (msg.author.id == '217348698294714370') {
+            if (!msg.mentions.users.first() && msgContent) {
+                msg.reply('You haven\'t specified anyone to send a message to.');
+            } else {
+                var sendTo = msg.mentions.users.first().id;
+                var d = new Date(msg.createdTimestamp);
+
+                msg.guild.members.fetch(sendTo).then(messageUser => {
+                    messageUser.send(msgContent);
+
+                    var emb = new MessageEmbed()
+                        .setColor(0xFFCC4D)
+                        .setTitle('uwufier - DM')
+                        .addField('Message content', `${msgContent}`)
+                        .addField('Recipient', `${msg.mentions.users.first()}`)
+                        .addField('Sender', `${msg.author}`)
+                        .addField('Time sent', `Now`)
+                    msg.say(emb)
+                });
+            }
+        } else {
+            msg.reply('Insufficent permissions.');
+        }
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/dogeify.ts b/src/commands/fun/dogeify.ts
new file mode 100644
index 0000000..3ec79bc
--- /dev/null
+++ b/src/commands/fun/dogeify.ts
@@ -0,0 +1,34 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import doge from 'dogeify-js';
+import emoji from 'emoji-random';
+
+module.exports = class DogeifyFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'dogeify',
+            aliases: ['doge'],
+            group: 'fun',
+            memberName: 'dogeify',
+            description: 'Dogifys anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to dogeify?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!dogeify please dogify this',
+                'uwu!doge can u do this as well'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    async run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = await doge(m);
+        msg.reply(u1 + ' ' emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/emoji.js b/src/commands/fun/emoji.ts
index ca633b9..2950738 100644
--- a/src/commands/fun/emoji.js
+++ b/src/commands/fun/emoji.ts
@@ -1,5 +1,5 @@
-const emoji = require('emoji-random');
-const { Command } = require('discord.js-commando');
+import emoji from 'emoji-random';
+import { Command, CommandoMessage } from 'discord.js-commando';
 
 module.exports = class EmojiFun extends Command {
     constructor(client) {
@@ -18,7 +18,7 @@ module.exports = class EmojiFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         msg.reply(emoji.random());
     }
 };
\ No newline at end of file
diff --git a/src/commands/fun/gay.js b/src/commands/fun/gay.ts
index ec78ee3..a522cf9 100644
--- a/src/commands/fun/gay.js
+++ b/src/commands/fun/gay.ts
@@ -1,4 +1,4 @@
-const { Command } = require('discord.js-commando');
+import { Command, CommandoMessage } from 'discord.js-commando';
 
 module.exports = class GayFun extends Command {
     constructor(client) {
@@ -22,11 +22,12 @@ module.exports = class GayFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var gayAmount = Math.floor((Math.random() * 100) + 1);
         var gayAmountDecimal = Math.floor((Math.random() * 100) + 1);
 
         msg.reply('Scanning..').then(scanningMsg => {
+            // @ts-ignore
             scanningMsg.delete()
             msg.reply('Your gay-ness amount is **' + gayAmount + '.' + gayAmountDecimal + '%**. 🏳️‍🌈');
         });
diff --git a/src/commands/fun/howify.ts b/src/commands/fun/howify.ts
new file mode 100644
index 0000000..e7e7eb6
--- /dev/null
+++ b/src/commands/fun/howify.ts
@@ -0,0 +1,32 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import how from 'howifier';
+import emoji from 'emoji-random';
+
+module.exports = class HowifyFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'howify',
+            aliases: ['how'],
+            group: 'fun',
+            memberName: 'howify',
+            description: 'Howifies any image you send.',
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'EMBED_LINKS'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'EMBED_LINKS'],
+            examples: ['uwu!howify', 'uwu!how']
+        });
+    }
+    run(msg: CommandoMessage) {
+        if (msg.attachments.size) {
+            // fs.unlinkSync('../../../node_modules/howifier/images/blissgay.jpeg')
+            msg.attachments.forEach(async attachment => {
+                var u1 = await how(attachment.url);
+                setTimeout(() => {
+                    msg.say({ files: [u1] })
+                }, 2000);
+            });
+        } else {
+            msg.reply('No image detected. ' + emoji.random())
+        }
+        
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/insult.ts b/src/commands/fun/insult.ts
new file mode 100644
index 0000000..aec2219
--- /dev/null
+++ b/src/commands/fun/insult.ts
@@ -0,0 +1,21 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import insult from 'insult';
+import emoji from 'emoji-random';
+
+module.exports = class InsultFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'insult',
+            aliases: ['insults'],
+            group: 'fun',
+            memberName: 'insult',
+            description: 'Gives you a random insult.',
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            examples: ['uwu!insult', 'uwu!insults']
+        });
+    }
+    run(msg: CommandoMessage) {
+        msg.reply(insult.Insult() + ' ' + emoji.random())
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/lorem.ts b/src/commands/fun/lorem.ts
new file mode 100644
index 0000000..c1d0e0e
--- /dev/null
+++ b/src/commands/fun/lorem.ts
@@ -0,0 +1,30 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import lm from 'lorem-memesum';
+import emoji from 'emoji-random';
+
+module.exports = class LoremFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'lorem',
+            aliases: ['lorem-impsum', 'loremipsum', 'ipsum', 'lorem-memesum', 'loremmemesum', 'memesum'],
+            group: 'fun',
+            memberName: 'lorem',
+            description: 'Gives you a random memeified Lorem Ipsum',
+            examples: [
+                'uwu!lorem',
+                'uwu!lorem-ipsum',
+                'uwu!loremipsum',
+                'uwu!ipsum',
+                'uwu!lorem-memesum',
+                'uwu!loremmemesum',
+                'uwu!memesum'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage) {
+        msg.reply(lm.sentence.randomSentence() + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/oddcase.ts b/src/commands/fun/oddcase.ts
new file mode 100644
index 0000000..b574244
--- /dev/null
+++ b/src/commands/fun/oddcase.ts
@@ -0,0 +1,32 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import ct from 'culturedtext';
+import emoji from 'emoji-random';
+
+module.exports = class OddcaseFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'oddcase',
+            group: 'fun',
+            memberName: 'oddcase',
+            description: 'Oddcases anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to oddcase?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!oddcase please oddcase this'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = ct.oddcase(m);
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/quote.js b/src/commands/fun/quote.ts
index 4a19a31..1e130a8 100644
--- a/src/commands/fun/quote.js
+++ b/src/commands/fun/quote.ts
@@ -1,6 +1,6 @@
-const atquotes = require('at-quotes');
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import atquotes from 'at-quotes';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class QuoteFun extends Command {
     constructor(client) {
@@ -14,7 +14,12 @@ module.exports = class QuoteFun extends Command {
                 usages: 5,
                 duration: 30
             },
-            examples: ['s5n!quote', 's5n!quote finn'],
+            examples: [
+                'uwu!quote',
+                'uwu!qutoes',
+                'uwu!quote finn',
+                'uwu!quotes ice king'
+            ],
             args: [
                 {
                     key: 'atCharacter',
@@ -26,7 +31,7 @@ module.exports = class QuoteFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg, { atCharacter }) {
+    run(msg: CommandoMessage, { atCharacter }) {
         if (!atCharacter || atCharacter == 'no' || atCharacter == 'n') {
             msg.reply(atquotes.getQuote() + ' ' + emoji.random());
         } else if (atCharacter == 'finn' || atCharacter == 'f') {
diff --git a/src/commands/fun/respect.js b/src/commands/fun/respect.ts
index 50d185b..863b9e7 100644
--- a/src/commands/fun/respect.js
+++ b/src/commands/fun/respect.ts
@@ -1,4 +1,4 @@
-const { Command } = require('discord.js-commando');
+import { Command, CommandoMessage } from 'discord.js-commando';
 
 module.exports = class RespectFun extends Command {
     constructor(client) {
@@ -14,7 +14,7 @@ module.exports = class RespectFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         msg.channel.send('Press F to pay respects.').then(m => {
             m.react('🇫');
             msg.delete();
diff --git a/src/commands/fun/say.js b/src/commands/fun/say.ts
index 667bb49..0d360bd 100644
--- a/src/commands/fun/say.js
+++ b/src/commands/fun/say.ts
@@ -1,4 +1,5 @@
-const { Command } = require('discord.js-commando');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class SayFun extends Command {
     constructor(client) {
@@ -20,12 +21,12 @@ module.exports = class SayFun extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg, { say }) {
+    run(msg: CommandoMessage, { say }) {
         if (msg.member.hasPermission('KICK_MEMBERS')) {
             msg.channel.send(say);
             msg.delete();
         } else {
-            msg.reply('Insufficent perms. ' + emoji.random());
+            msg.reply('Insufficent permsissions. ' + emoji.random());
         }
     }
 };
\ No newline at end of file
diff --git a/src/commands/fun/spongebob.ts b/src/commands/fun/spongebob.ts
new file mode 100644
index 0000000..07c7d83
--- /dev/null
+++ b/src/commands/fun/spongebob.ts
@@ -0,0 +1,35 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import sbm from 'spongibobu.js';
+import emoji from 'emoji-random';
+
+module.exports = class SpongebobFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'spongebob',
+            aliases: ['spongibobu', 'sbm'],
+            group: 'fun',
+            memberName: 'spongebob',
+            description: 'Spongebob memifys anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to spongebob memify?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!spongebob please spongebob memify this',
+                'uwu!spongibobu sponge gang',
+                'uwu!sbm oooh example'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = sbm(m);
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/stretch.ts b/src/commands/fun/stretch.ts
new file mode 100644
index 0000000..19d4bfa
--- /dev/null
+++ b/src/commands/fun/stretch.ts
@@ -0,0 +1,33 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import ct from 'culturedtext';
+import emoji from 'emoji-random';
+
+module.exports = class StretchFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'stretch',
+            aliases: ['stretched'],
+            group: 'fun',
+            memberName: 'stretch',
+            description: 'Stretches anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to stretch?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!stretch please stretch this'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = ct.stretched(m);
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/surreal.ts b/src/commands/fun/surreal.ts
new file mode 100644
index 0000000..37fe21a
--- /dev/null
+++ b/src/commands/fun/surreal.ts
@@ -0,0 +1,32 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import ct from 'culturedtext';
+import emoji from 'emoji-random';
+
+module.exports = class SurrealFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'surreal',
+            group: 'fun',
+            memberName: 'surreal',
+            description: 'Surrealifies anything you send.',
+            args: [
+                {
+                    key: 'userMsg',
+                    prompt: 'What would you like to surrealify?',
+                    type: 'string'
+                }
+            ],
+            examples: [
+                'uwu!surreal please surrealify this'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+        });
+    }
+    run(msg: CommandoMessage, { userMsg }) {
+        var m = userMsg;
+        var u1 = ct.surreal(m);
+        msg.reply(u1 + ' ' + emoji.random());
+        msg.delete();
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/uwufy.ts b/src/commands/fun/uwufy.ts
index 9e40078..db0f19b 100644
--- a/src/commands/fun/uwufy.ts
+++ b/src/commands/fun/uwufy.ts
@@ -1,5 +1,5 @@
-import { Message } from "discord.js";
-import { Command } from 'discord.js-commando';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class UwufyFun extends Command {
     constructor(client) {
@@ -16,16 +16,21 @@ module.exports = class UwufyFun extends Command {
                     type: 'string'
                 }
             ],
-            examples: ['uwu!say please uwufy this'],
+            examples: [
+                'uwu!uwufy please uwufy this',
+                'uwu!uwu can u uwufy this',
+                'uwu!owofy this thx',
+                'uwu!owo nice now this'
+            ],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg: Message, { userMsg }) {
+    run(msg: CommandoMessage, { userMsg }) {
         var m = userMsg;
         var u1 = m.replace('r', 'w');
         var u2 = u1.replace('l', 'w');
-        msg.reply(u2);
+        msg.reply(u2 + ' ' + emoji.random());
         msg.delete();
     }
 };
\ No newline at end of file
diff --git a/src/commands/utility/btc.ts b/src/commands/utility/btc.ts
index 2845194..c0c14f3 100644
--- a/src/commands/utility/btc.ts
+++ b/src/commands/utility/btc.ts
@@ -1,4 +1,4 @@
-import { Command } from 'discord.js-commando';
+import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import btc from 'btc-value';
 btc.setApiKey('a43419ce-fc59-4951-8af9-20c5e36ef73f');
@@ -14,7 +14,7 @@ module.exports = class BTCUtility extends Command {
             args: [
                 {
                     key: 'currencyName',
-                    prompt: 'What currency could you like to see it in? (USD, AUD, CAD)',
+                    prompt: 'What currency could you like to see it in? (USD, AUD, CAD, etc.)',
                     type: 'string'
                 }
             ],
@@ -27,7 +27,7 @@ module.exports = class BTCUtility extends Command {
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg: Message, { currencyName }) {
+    run(msg: CommandoMessage, { currencyName }) {
         currencyName = currencyName.toUpperCase();
         btc({ isDecimal: true, currencyCode: currencyName }).then(value => {
             msg.reply('The current price of *Bitcoin* in **' + currencyName + '** is **' + value + '**. ' + emoji.random());
diff --git a/src/commands/utility/btcchange.js b/src/commands/utility/btcchange.ts
index 474a3ee..9ef5d4d 100644
--- a/src/commands/utility/btcchange.js
+++ b/src/commands/utility/btcchange.ts
@@ -1,5 +1,6 @@
-const { Command } = require('discord.js-commando');
-const btc = require('btc-value');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import btc from 'btc-value';
+import emoji from 'emoji-random';
 btc.setApiKey('a43419ce-fc59-4951-8af9-20c5e36ef73f');
 
 module.exports = class BTCChangeUtility extends Command {
@@ -27,7 +28,7 @@ module.exports = class BTCChangeUtility extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg, { timeAmount }) {
+    run(msg: CommandoMessage, { timeAmount }) {
         if (timeAmount == 'day') {
             btc.getPercentageChangeLastDay().then(percentage => {
                 msg.reply('The fluction amount of *Bitcoin* in the last **' + timeAmount + '** is **' + percentage + '%**. ' + emoji.random());
diff --git a/src/commands/utility/clear.js b/src/commands/utility/clear.ts
index 6871cca..80e0c73 100644
--- a/src/commands/utility/clear.js
+++ b/src/commands/utility/clear.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class ClearUtility extends Command {
     constructor(client) {
@@ -28,22 +28,26 @@ module.exports = class ClearUtility extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'MANAGE_MESSAGES']
         });
     }
-    async run(msg, { deleteAmount }) {
+    async run(msg: CommandoMessage, { deleteAmount }) {
         if (msg.member.hasPermission('MANAGE_MESSAGES')) {
             if (!deleteAmount) {
                 msg.reply('You haven\'t specified an amount of messages which should be deleted. ' + emoji.random()).then(deleteNotificationMessage => {
+                    // @ts-ignore
                     deleteNotificationMessage.delete({ timeout: 1000 });
                 });
             } else if (isNaN(deleteAmount)) {
                 msg.reply('The amount parameter isn\'t a number. ' + emoji.random()).then(deleteNotificationMessage => {
+                    // @ts-ignore
                     deleteNotificationMessage.delete({ timeout: 1000 });
                 });
             } else if (deleteAmount > 100) {
                 msg.reply('You can\'t delete more than 100 messages at once. ' + emoji.random()).then(deleteNotificationMessage => {
+                    // @ts-ignore
                     deleteNotificationMessage.delete({ timeout: 1000 });
                 });
             } else if (deleteAmount < 1) {
                 msg.reply('You have to delete at least 1 message. ' + emoji.random()).then(deleteNotificationMessage => {
+                    // @ts-ignore
                     deleteNotificationMessage.delete({ timeout: 1000 });
                 });
             }
@@ -62,11 +66,12 @@ module.exports = class ClearUtility extends Command {
                     msg.channel.bulkDelete(messages);
                 });
                 msg.reply('It\'s been deleted ~uwu ' + emoji.random()).then(deleteNotificationMessage => {
+                    // @ts-ignore
                     deleteNotificationMessage.delete({ timeout: 1000 });
                 });
             }
         } else {
-            msg.reply('Insufficent perms. ' + emoji.random());
+            msg.reply('Insufficent permsissions. ' + emoji.random());
         }
     }
 };
\ No newline at end of file
diff --git a/src/commands/utility/membercount.js b/src/commands/utility/membercount.ts
index 1178236..4d64f5d 100644
--- a/src/commands/utility/membercount.js
+++ b/src/commands/utility/membercount.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class MemberCountUtility extends Command {
     constructor(client) {
@@ -23,7 +23,7 @@ module.exports = class MemberCountUtility extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         msg.reply(`There are **${msg.guild.memberCount}** members in **${msg.guild.name}**. ` + emoji.random());
     }
 };
\ No newline at end of file
diff --git a/src/commands/utility/server.js b/src/commands/utility/server.ts
index 58555fa..f5fddca 100644
--- a/src/commands/utility/server.js
+++ b/src/commands/utility/server.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const { MessageEmbed } = require('discord.js');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 
 module.exports = class ServerUtility extends Command {
     constructor(client) {
@@ -32,7 +32,7 @@ module.exports = class ServerUtility extends Command {
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var o = msg.guild.members.cache.filter(m => m.presence.status === 'online').size;
 
         let embed = new MessageEmbed()
@@ -43,10 +43,10 @@ module.exports = class ServerUtility extends Command {
             .addField('Owner', `${msg.guild.owner}`, false)
             .addField(`Members [${msg.guild.memberCount}]`, `${o} members are online.`, true)
             .addField('Region', `${msg.guild.region}`, true)
-            .addField('Text channels', `${msg.guild.channels.filter(c => c.type === 'text').size}`, true)
-            .addField('Voice channels', `${msg.guild.channels.filter(c => c.type === 'voice').size}`, true)
+            .addField('Text channels', `${msg.guild.channels.cache.filter(c => c.type === 'text').size}`, true)
+            .addField('Voice channels', `${msg.guild.channels.cache.filter(c => c.type === 'voice').size}`, true)
             .addField('Guild created', `${msg.guild.createdAt}`, false)
-            .addField(`${this.client.user.username} joined`, `${msg.guild.members.get('699473263998271489').joinedAt}`)
+            .addField(`${this.client.user.username} joined`, `${msg.guild.members.cache.get('699473263998271489').joinedAt}`)
             .setColor(0xFFCC4D);
 
         msg.channel.send(embed);
diff --git a/src/commands/utility/servercount.ts b/src/commands/utility/servercount.ts
index 7e92247..b3ce320 100644
--- a/src/commands/utility/servercount.ts
+++ b/src/commands/utility/servercount.ts
@@ -1,5 +1,5 @@
-import { Command } from 'discord.js-commando';
-import { MessageEmbed, Message } from 'discord.js';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 import emoji from 'emoji-random';
 
 module.exports = class ServerCountUtility extends Command {
@@ -14,7 +14,7 @@ module.exports = class ServerCountUtility extends Command {
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg: Message) {
+    run(msg: CommandoMessage) {
         msg.channel.send('Please wait...').then(m => {
             m.edit(`** **`);
 
diff --git a/src/commands/utility/uptime.ts b/src/commands/utility/uptime.ts
index 1bea003..dcce606 100644
--- a/src/commands/utility/uptime.ts
+++ b/src/commands/utility/uptime.ts
@@ -1,9 +1,8 @@
-import { Command } from 'discord.js-commando';
+import { Command, CommandoMessage } from 'discord.js-commando';
 import { duration as _duration } from 'moment';
 import 'moment-duration-format';
-// @ts-ignore
 import emoji from 'emoji-random';
-import { MessageEmbed, Message } from 'discord.js';
+import { MessageEmbed } from 'discord.js';
 
 export default class UptimeUtility extends Command {
     constructor(client) {
@@ -25,13 +24,13 @@ export default class UptimeUtility extends Command {
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
     }
-    run(msg: Message) {
+    run(msg: CommandoMessage) {
         const duration = _duration(this.client.uptime).format(" D [days], H [hrs], m [mins], s [secs]");
         msg.channel.send('Please wait...').then(m => {
             m.edit(`** **`);
 
             let emb = new MessageEmbed()
-                .setDescription('uwufier has been up for ' + duration + '. ' + emoji.random())
+                .setDescription('<@699473263998271489> has been up for ' + duration + '. ' + emoji.random())
                 .setColor(0xFFCC4D)
 
             msg.channel.send(emb);
diff --git a/src/commands/voice/abee.ts b/src/commands/voice/abee.ts
index 939b575..2af71af 100644
--- a/src/commands/voice/abee.ts
+++ b/src/commands/voice/abee.ts
@@ -1,6 +1,6 @@
 import ytdl from 'ytdl-core';
-import { Command } from 'discord.js-commando';
-import { MessageEmbed, Message } from 'discord.js';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 import Youtube from 'simple-youtube-api';
 //const { youtubeAPI } = require('../../config.json');
 import config from '../../config.json';
@@ -21,7 +21,7 @@ module.exports = class ABeeVoice extends Command {
             examples: ['uwu!abee', 'uwu!a-bee'],
         });
     }
-    async run(msg: Message) {
+    async run(msg: CommandoMessage) {
         const voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.say('Please join a channel and try again. ' + emoji.random());
 
@@ -120,7 +120,7 @@ module.exports = class ABeeVoice extends Command {
                     });
             });
     }
-    playSong(queue, msg) {
+    playSong(queue, msg: CommandoMessage) {
         const classThis = this; // use classThis instead of 'this' because of lexical scope below
         queue[0].voiceChannel
             .join()
diff --git a/src/commands/voice/itemshop.ts b/src/commands/voice/itemshop.ts
index f8c0b2b..76e1f03 100644
--- a/src/commands/voice/itemshop.ts
+++ b/src/commands/voice/itemshop.ts
@@ -1,6 +1,6 @@
 import ytdl from 'ytdl-core';
-import { Command } from 'discord.js-commando';
-import { MessageEmbed, Message } from 'discord.js';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 import Youtube from 'simple-youtube-api';
 //const { youtubeAPI } = require('../../config.json');
 import config from '../../config.json';
@@ -21,7 +21,7 @@ module.exports = class ABeeVoice extends Command {
             examples: ['uwu!itemshop', 'uwu!item-shop']
         });
     }
-    async run(msg: Message) {
+    async run(msg: CommandoMessage) {
         const voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.say('Please join a channel and try again. ' + emoji.random());
 
@@ -121,7 +121,7 @@ module.exports = class ABeeVoice extends Command {
                     });
             });
     }
-    playSong(queue, msg) {
+    playSong(queue, msg: CommandoMessage) {
         const classThis = this; // use classThis instead of 'this' because of lexical scope below
         queue[0].voiceChannel
             .join()
diff --git a/src/commands/voice/join.js b/src/commands/voice/join.ts
index 4410e4c..ce414f4 100644
--- a/src/commands/voice/join.js
+++ b/src/commands/voice/join.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class JoinVoice extends Command {
     constructor(client) {
@@ -18,7 +18,7 @@ module.exports = class JoinVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         if (msg.guild.musicData.isPlaying == false && msg.member.voice.channel) {
             msg.member.voice.channel.join();
             msg.reply('Succesfully joined voice channel. ' + emoji.random());
diff --git a/src/commands/voice/leave.js b/src/commands/voice/leave.ts
index 4c25e62..bdcf259 100644
--- a/src/commands/voice/leave.js
+++ b/src/commands/voice/leave.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class LeaveVoice extends Command {
     constructor(client) {
@@ -15,7 +15,7 @@ module.exports = class LeaveVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/loop.js b/src/commands/voice/loop.ts
index 05c0e99..a3bda2a 100644
--- a/src/commands/voice/loop.js
+++ b/src/commands/voice/loop.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class LoopVoice extends Command {
     constructor(client) {
@@ -15,7 +15,7 @@ module.exports = class LoopVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/minecraft.ts b/src/commands/voice/minecraft.ts
index cad7c06..ea8fb6d 100644
--- a/src/commands/voice/minecraft.ts
+++ b/src/commands/voice/minecraft.ts
@@ -1,5 +1,5 @@
 import ytdl from 'ytdl-core';
-import { Command } from 'discord.js-commando';
+import { Command, CommandoMessage } from 'discord.js-commando';
 import { MessageEmbed } from 'discord.js';
 import Youtube from 'simple-youtube-api';
 //const { youtubeAPI } = require('../../config.json');
@@ -27,9 +27,9 @@ module.exports = class MinecraftVoice extends Command {
             ]
         });
     }
-    async run(msg) {
+    async run(msg: CommandoMessage) {
         const voiceChannel = msg.member.voice.channel;
-        if (!voiceChannel) return msg.say('Join a channel and try again. ' + emoji.random());
+        if (!voiceChannel) return msg.say('Please join a channel and try again. ' + emoji.random());
 
         const playlist = await youtube.getPlaylist('https://www.youtube.com/watch?v=05UM-i4PuOY&list=PLxOTV5xn7n1i2HcKtRBthP2loWjrBGAIY').catch(function () {
             return msg.say('There was a problem getting the soundtrack. ' + emoji.random());
@@ -125,7 +125,7 @@ module.exports = class MinecraftVoice extends Command {
                     });
             });
     }
-    playSong(queue, msg) {
+    playSong(queue, msg: CommandoMessage) {
         const classThis = this; // use classThis instead of 'this' because of lexical scope below
         queue[0].voiceChannel
             .join()
diff --git a/src/commands/voice/pause.js b/src/commands/voice/pause.ts
index 6ab6fb0..c2475d2 100644
--- a/src/commands/voice/pause.js
+++ b/src/commands/voice/pause.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class PauseVoice extends Command {
     constructor(client) {
@@ -14,7 +14,7 @@ module.exports = class PauseVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/play.ts b/src/commands/voice/play.ts
index 61cf5d4..b60cb73 100644
--- a/src/commands/voice/play.ts
+++ b/src/commands/voice/play.ts
@@ -1,6 +1,6 @@
 import ytdl from 'ytdl-core';
-import { Command } from 'discord.js-commando';
-import { MessageEmbed, Message } from 'discord.js';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 import Youtube from 'simple-youtube-api';
 //const { youtubeAPI } = require('../../config.json');
 import config from '../../config.json';
@@ -33,7 +33,7 @@ module.exports = class PlayVoice extends Command {
             ]
         });
     }
-    async run(msg: Message, { query }) {
+    async run(msg: CommandoMessage, { query }) {
         const voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.say('Please join a channel and try again. ' + emoji.random());
 
@@ -213,7 +213,7 @@ module.exports = class PlayVoice extends Command {
                 );
             });
     }
-    playSong(queue, msg) {
+    playSong(queue, msg: CommandoMessage) {
         const classThis = this; // use classThis instead of 'this' because of lexical scope below
         queue[0].voiceChannel
             .join()
diff --git a/src/commands/voice/psycho.ts b/src/commands/voice/psycho.ts
index 827c00a..115b0b8 100644
--- a/src/commands/voice/psycho.ts
+++ b/src/commands/voice/psycho.ts
@@ -1,6 +1,6 @@
 import ytdl from 'ytdl-core';
-import { Command } from 'discord.js-commando';
-import { MessageEmbed, Message } from 'discord.js';
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
 import Youtube from 'simple-youtube-api';
 //const { youtubeAPI } = require('../../config.json');
 import config from '../../config.json';
@@ -20,7 +20,7 @@ module.exports = class PsychoVoice extends Command {
             examples: ['uwu!psycho']
         });
     }
-    async run(msg: Message, { query }) {
+    async run(msg: CommandoMessage, { query }) {
         const voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.say('Please join a channel and try again. ' + emoji.random());
 
@@ -119,7 +119,7 @@ module.exports = class PsychoVoice extends Command {
                     });
             });
     }
-    playSong(queue, msg) {
+    playSong(queue, msg: CommandoMessage) {
         const classThis = this; // use classThis instead of 'this' because of lexical scope below
         queue[0].voiceChannel
             .join()
diff --git a/src/commands/voice/queue.js b/src/commands/voice/queue.ts
index 59fce1a..b92852a 100644
--- a/src/commands/voice/queue.js
+++ b/src/commands/voice/queue.ts
@@ -1,6 +1,6 @@
-const { Command } = require('discord.js-commando');
-const { MessageEmbed } = require('discord.js');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed }from 'discord.js';
+import emoji from 'emoji-random';
 
 module.exports = class QueueVoice extends Command {
     constructor(client) {
@@ -33,7 +33,7 @@ module.exports = class QueueVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         if (msg.guild.musicData.queue.length == 0)
             return msg.say('There aren\'t any songs in the current queue. ' + emoji.random());
         const titleArray = [];
diff --git a/src/commands/voice/remove.js b/src/commands/voice/remove.ts
index 34a30de..5d84f0c 100644
--- a/src/commands/voice/remove.js
+++ b/src/commands/voice/remove.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class RemoveVoice extends Command {
     constructor(client) {
@@ -21,7 +21,7 @@ module.exports = class RemoveVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg, { songNumber }) {
+    run(msg: CommandoMessage, { songNumber }) {
         if (songNumber < 1 && songNumber >= msg.guild.musicData.queue.length) {
             return msg.reply('Please enter a valid song. ' + emoji.random());
         }
diff --git a/src/commands/voice/resume.js b/src/commands/voice/resume.ts
index 1b28b28..39874df 100644
--- a/src/commands/voice/resume.js
+++ b/src/commands/voice/resume.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class ResumeVoice extends Command {
     constructor(client) {
@@ -14,7 +14,7 @@ module.exports = class ResumeVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ') + emoji.random();
 
diff --git a/src/commands/voice/shuffle.js b/src/commands/voice/shuffle.ts
index 3183f87..c50181f 100644
--- a/src/commands/voice/shuffle.js
+++ b/src/commands/voice/shuffle.ts
@@ -1,6 +1,6 @@
-const { Command } = require('discord.js-commando');
-const { MessageEmbed } = require('discord.js');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import { MessageEmbed } from 'discord.js';
+import emoji from 'emoji-random';
 
 module.exports = class ShuffleVoice extends Command {
     constructor(client) {
@@ -15,7 +15,7 @@ module.exports = class ShuffleVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/skip.js b/src/commands/voice/skip.ts
index 8638291..c8c4c62 100644
--- a/src/commands/voice/skip.js
+++ b/src/commands/voice/skip.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class SkipVoice extends Command {
     constructor(client) {
@@ -14,7 +14,7 @@ module.exports = class SkipVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         const voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/skipall.js b/src/commands/voice/skipall.ts
index e981f46..dbcfeb5 100644
--- a/src/commands/voice/skipall.js
+++ b/src/commands/voice/skipall.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class SkipAllVoice extends Command {
     constructor(client) {
@@ -25,7 +25,7 @@ module.exports = class SkipAllVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg) {
+    run(msg: CommandoMessage) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());
 
diff --git a/src/commands/voice/skipto.js b/src/commands/voice/skipto.ts
index f43d56c..fab0d68 100644
--- a/src/commands/voice/skipto.js
+++ b/src/commands/voice/skipto.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class SkipToVoice extends Command {
     constructor(client) {
@@ -19,7 +19,7 @@ module.exports = class SkipToVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg, { songNumber }) {
+    run(msg: CommandoMessage, { songNumber }) {
         if (songNumber < 1 && songNumber >= msg.guild.musicData.queue.length) {
             return msg.reply('Please enter a valid song. ' + emoji.random());
         }
diff --git a/src/commands/voice/volume.js b/src/commands/voice/volume.ts
index 96a6de3..debd798 100644
--- a/src/commands/voice/volume.js
+++ b/src/commands/voice/volume.ts
@@ -1,5 +1,5 @@
-const { Command } = require('discord.js-commando');
-const emoji = require('emoji-random');
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
 
 module.exports = class VolumeVoice extends Command {
     constructor(client) {
@@ -26,7 +26,7 @@ module.exports = class VolumeVoice extends Command {
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
     }
-    run(msg, { wantedVol }) {
+    run(msg: CommandoMessage, { wantedVol }) {
         var voiceChannel = msg.member.voice.channel;
         if (!voiceChannel) return msg.reply('Please join a channel and try again. ' + emoji.random());