A New World, v8.0.0

- change some formatting
- add throttling to all commands
- change timout in welcome and clear
- add another edge case to welcome and darling
- use new mongo.connect params for stability
- move some commands around
- remove some tsingnores for idk

in total, epic update 8)

54 files changed, 312 insertions, 56 deletions

diff --git a/src/bot.ts b/src/bot.ts
index 3431048..9b34f46 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -3,7 +3,7 @@ import { CommandoClient } from 'discord.js-commando';
 //import WS  from './ws/ws';
 import Welcome from './models/welcome.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9')
+mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
 import path from 'path';
 import emoji from 'emoji-random';
 require('./models/MusicGuild.js')
@@ -11,7 +11,7 @@ require('./models/MusicGuild.js')
 const client = new CommandoClient({
     commandPrefix: 'uwu!',
     owner: '217348698294714370',
-    invite: 'https://discord.gg/DVwXUwx',
+    invite: 'https://discord.gg/DVwXUwx'
 });
 
 //var ws = new WS('123456', process.env.PORT, client)
@@ -32,7 +32,8 @@ client.registry
     ])
     .registerDefaultGroups()
     .registerDefaultCommands({
-        help: true
+        help: true,
+        eval: false
     })
     .registerCommandsIn(path.join(__dirname, 'commands'));
 
@@ -55,7 +56,7 @@ client.once('ready', () => {
     console.log('\x1b[0m' + 'Servers: ' + '\x1b[36m' + `${client.guilds.cache.size}` + '\x1b[0m')
     console.log()
     
-    client.user.setActivity('uwu!help | v' + config['version'], {
+    client.user?.setActivity('uwu!help | v' + config['version'], {
         type: 'WATCHING'
     });
 });
@@ -65,7 +66,10 @@ client.on('error', console.error);
 
 client.on('guildCreate', guild => {
     console.log(`Joined server: ${guild.name}`)
-    guild.owner?.send('Hi! Thank you for inviting my bot to your server! To view the complete list of commands, do `uwu!help`. If you\'d like, you can also change the prefix using `uwu!prefix change <prefix>`. If you want to contact the lead developer for possible suggestions or to report a bug please join the support server: https://discord.gg/DVwXUwx. ' + emoji.random())
+    guild.owner?.send('Hi! Thank you for inviting my bot to your server! To view the complete list of commands, do `uwu!help`. If you\'d like, you can also change the prefix using `uwu!prefix change <prefix>`. If you want to contact the lead developer for possible suggestions or to report a bug, please join the support server: https://crack.cf/uwufier-support. ' + emoji.random())
+})
+client.on('guildDelete', guild => {
+    console.log(`Left server: ${guild.name}`)
 })
 
 client.on('guildMemberAdd', member => {
@@ -75,7 +79,7 @@ client.on('guildMemberAdd', member => {
         } else if (!guild) {
             return
         } else if (guild) {
-            member.guild.channels.cache.get(guild.channelID).send(`<@${member.id}> has joined **${member.guild.name}**! ` + emoji.random())
+            member.guild.channels.cache.get(guild.channelID)?.send(`<@${member.id}> has joined **${member.guild.name}**! ` + emoji.random())
         } else {
             return
         }
@@ -93,7 +97,7 @@ client.on('message', async msg => {
         if (msg.channel.type == 'dm') {
             console.log(msg.author.tag, 'says', msgContent, 'in a DM');
         } else {
-            console.log(msg.member.user.tag, 'says', msgContent, 'in #' + msg.channel.name + ' in ' + msg.guild.name);
+            console.log(msg.member?.user.tag, 'says', msgContent, 'in #' + msg.channel.name + ' in ' + msg.guild?.name);
         }
     }
     
diff --git a/src/commands/anime/uwufy.ts b/src/commands/anime/uwufy.ts
index db0f19b..a2380e5 100644
--- a/src/commands/anime/uwufy.ts
+++ b/src/commands/anime/uwufy.ts
@@ -24,6 +24,10 @@ module.exports = class UwufyFun extends Command {
             ],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage, { userMsg }) {
diff --git a/src/commands/bot/clientid.ts b/src/commands/bot/clientid.ts
index da7717e..ea89891 100644
--- a/src/commands/bot/clientid.ts
+++ b/src/commands/bot/clientid.ts
@@ -12,7 +12,11 @@ module.exports = class ClientIDBot extends Command {
             description: 'Tells you the bot\'s client ID version.',
             examples: ['uwu!clientid', 'uwu!cid'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/bot/invite.ts b/src/commands/bot/invite.ts
index 8c798d1..0b72063 100644
--- a/src/commands/bot/invite.ts
+++ b/src/commands/bot/invite.ts
@@ -11,7 +11,11 @@ module.exports = class InviteBot extends Command {
             description: 'Gives you the bot\'s invite link.',
             examples: ['uwu!invite', 'uwu!inv'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/bot/joinmessage.ts b/src/commands/bot/joinmessage.ts
new file mode 100644
index 0000000..a98bee5
--- /dev/null
+++ b/src/commands/bot/joinmessage.ts
@@ -0,0 +1,29 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
+
+module.exports = class InviteBot extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'joinmessage',
+            aliases: ['joinm', 'mjoin', 'joinmsg'],
+            group: 'bot',
+            memberName: 'joinmessage',
+            description: 'Resends the message which the bot sends when initially joining a server, however, this one doesn\'t go to the guild owner.',
+            examples: [
+                'uwu!joinmessage',
+                'uwu!joinm',
+                'uwu!mjoin',
+                'uwu!joinmsg'
+            ],
+            userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+        });
+    }
+    run(msg: CommandoMessage) {
+        msg.reply('Hi! Thank you for inviting my bot to your server! To view the complete list of commands, do `uwu!help`. If you\'d like, you can also change the prefix using `uwu!prefix change <prefix>`. If you want to contact the lead developer for possible suggestions or to report a bug, please join the support server: https://crack.cf/uwufier-support. ' + emoji.random())
+    }
+};
\ No newline at end of file
diff --git a/src/commands/bot/memorystats.ts b/src/commands/bot/memorystats.ts
index 669ac84..fd8be76 100644
--- a/src/commands/bot/memorystats.ts
+++ b/src/commands/bot/memorystats.ts
@@ -18,7 +18,12 @@ module.exports = class MemoryStatsBot extends Command {
             memberName: 'memorystats',
             description: 'Checks the full, current, approximate memory usage statistics of the bot\'s Node.js process.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            ownerOnly: true
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/bot/memoryusage.ts b/src/commands/bot/memoryusage.ts
index 545edd5..c204454 100644
--- a/src/commands/bot/memoryusage.ts
+++ b/src/commands/bot/memoryusage.ts
@@ -17,7 +17,12 @@ module.exports = class MemoryUsageBot extends Command {
             memberName: 'memoryusage',
             description: 'Checks the current, approximate memory usage of the bot\'s Node.js process.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            ownerOnly: true
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/server/servercount.ts b/src/commands/bot/servercount.ts
index 4690caa..49fcc5c 100644
--- a/src/commands/server/servercount.ts
+++ b/src/commands/bot/servercount.ts
@@ -11,7 +11,8 @@ module.exports = class ServerCountServer extends Command {
             memberName: 'servercount',
             description: 'Tells you the amount of servers uwufy is in.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            ownerOnly: true
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/crypto/btc.ts b/src/commands/crypto/btc.ts
index 3f3ffe9..5fd5f67 100644
--- a/src/commands/crypto/btc.ts
+++ b/src/commands/crypto/btc.ts
@@ -23,6 +23,10 @@ module.exports = class BTCCrypto extends Command {
                 'uwu!crypto cad',
                 'uwu!btc usd'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
diff --git a/src/commands/crypto/btcchange.ts b/src/commands/crypto/btcchange.ts
index 67eb0c7..4218c31 100644
--- a/src/commands/crypto/btcchange.ts
+++ b/src/commands/crypto/btcchange.ts
@@ -18,6 +18,10 @@ module.exports = class BTCChangeCrypto extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: [
                 'uwu!btcchange day',
                 'uwu!bitcoinchange hour',
diff --git a/src/commands/fun/aesthetic.ts b/src/commands/fun/aesthetic.ts
index 54bde0c..a565d84 100644
--- a/src/commands/fun/aesthetic.ts
+++ b/src/commands/fun/aesthetic.ts
@@ -9,17 +9,21 @@ module.exports = class AestheticFun extends Command {
             aliases: ['aestheticifize'],
             group: 'fun',
             memberName: 'aesthetic',
-            description: 'Aestheticifizes anything you send.',
+            description: 'Aestheticifies anything you send.',
             args: [
                 {
                     key: 'userMsg',
-                    prompt: 'What would you like to aestheticifize?',
+                    prompt: 'What would you like to aestheticifie?',
                     type: 'string'
                 }
             ],
             examples: [
-                'uwu!aesthetic please aestheticifize this'
+                'uwu!aesthetic please aestheticifie this'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
diff --git a/src/commands/fun/culturedtext.ts b/src/commands/fun/culturedtext.ts
index 499b3e6..48b3fb8 100644
--- a/src/commands/fun/culturedtext.ts
+++ b/src/commands/fun/culturedtext.ts
@@ -26,6 +26,10 @@ module.exports = class CulturedTextFun extends Command {
             examples: [
                 'uwu!culturedtext oddcase please cultured textify this'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
diff --git a/src/commands/fun/dicksize.ts b/src/commands/fun/dicksize.ts
index 9e023d1..4e1ebd1 100644
--- a/src/commands/fun/dicksize.ts
+++ b/src/commands/fun/dicksize.ts
@@ -17,6 +17,10 @@ module.exports = class DickSizeFun extends Command {
                 'uwu!peepeesize',
                 'uwu!ppsize'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
diff --git a/src/commands/fun/dogeify.ts b/src/commands/fun/dogeify.ts
index 1c8757b..a5af4a2 100644
--- a/src/commands/fun/dogeify.ts
+++ b/src/commands/fun/dogeify.ts
@@ -17,6 +17,10 @@ module.exports = class DogeifyFun extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: [
                 'uwu!dogeify please dogify this',
                 'uwu!doge can u do this as well'
diff --git a/src/commands/fun/gay.ts b/src/commands/fun/gay.ts
index 6ca5138..4148a67 100644
--- a/src/commands/fun/gay.ts
+++ b/src/commands/fun/gay.ts
@@ -18,6 +18,10 @@ module.exports = class GayFun extends Command {
                 'uwu!gayrange',
                 'uwu!gayrate'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
diff --git a/src/commands/fun/hello.ts b/src/commands/fun/hello.ts
index e4d06f3..e555a30 100644
--- a/src/commands/fun/hello.ts
+++ b/src/commands/fun/hello.ts
@@ -9,10 +9,13 @@ module.exports = class HelloFun extends Command {
             group: 'fun',
             memberName: 'hello',
             description: 'Say hello to uwufier!',
-            guildOnly: true,
             examples: ['uwu!hello', 'uwu!hey', 'uwu!hi'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+            clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/fun/howify.ts b/src/commands/fun/howify.ts
index 6529975..a0cbbf5 100644
--- a/src/commands/fun/howify.ts
+++ b/src/commands/fun/howify.ts
@@ -12,7 +12,12 @@ module.exports = class HowifyFun extends Command {
             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']
+            examples: ['uwu!howify', 'uwu!how'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/fun/insult.ts b/src/commands/fun/insult.ts
index aec2219..ac163cc 100644
--- a/src/commands/fun/insult.ts
+++ b/src/commands/fun/insult.ts
@@ -12,6 +12,10 @@ module.exports = class InsultFun extends Command {
             description: 'Gives you a random insult.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: ['uwu!insult', 'uwu!insults']
         });
     }
diff --git a/src/commands/fun/lorem.ts b/src/commands/fun/lorem.ts
index c970247..3189375 100644
--- a/src/commands/fun/lorem.ts
+++ b/src/commands/fun/lorem.ts
@@ -19,6 +19,10 @@ module.exports = class LoremFun extends Command {
                 'uwu!loremmemesum',
                 'uwu!memesum'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
diff --git a/src/commands/fun/oddcase.ts b/src/commands/fun/oddcase.ts
index b574244..890773d 100644
--- a/src/commands/fun/oddcase.ts
+++ b/src/commands/fun/oddcase.ts
@@ -19,6 +19,10 @@ module.exports = class OddcaseFun extends Command {
             examples: [
                 'uwu!oddcase please oddcase this'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
         });
diff --git a/src/commands/fun/respect.ts b/src/commands/fun/respect.ts
index 863b9e7..b41a319 100644
--- a/src/commands/fun/respect.ts
+++ b/src/commands/fun/respect.ts
@@ -9,7 +9,10 @@ module.exports = class RespectFun extends Command {
             memberName: 'respect',
             description: 'Press F to pay respects.',
             examples: ['uwu!respect', 'uwu!f'],
-            guildOnly: true,
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
diff --git a/src/commands/fun/say.ts b/src/commands/fun/say.ts
index 0d360bd..fa97b3a 100644
--- a/src/commands/fun/say.ts
+++ b/src/commands/fun/say.ts
@@ -8,7 +8,6 @@ module.exports = class SayFun extends Command {
             group: 'fun',
             memberName: 'say',
             description: 'Allows you to speak as the bot.',
-            guildOnly: true,
             args: [
                 {
                     key: 'say',
@@ -17,6 +16,10 @@ module.exports = class SayFun extends Command {
                 }
             ],
             examples: ['uwu!say hi'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
         });
diff --git a/src/commands/fun/spongebob.ts b/src/commands/fun/spongebob.ts
index 07c7d83..d8010a6 100644
--- a/src/commands/fun/spongebob.ts
+++ b/src/commands/fun/spongebob.ts
@@ -17,6 +17,10 @@ module.exports = class SpongebobFun extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: [
                 'uwu!spongebob please spongebob memify this',
                 'uwu!spongibobu sponge gang',
diff --git a/src/commands/fun/stretch.ts b/src/commands/fun/stretch.ts
index 19d4bfa..4bb8d00 100644
--- a/src/commands/fun/stretch.ts
+++ b/src/commands/fun/stretch.ts
@@ -17,6 +17,10 @@ module.exports = class StretchFun extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: [
                 'uwu!stretch please stretch this'
             ],
diff --git a/src/commands/fun/surreal.ts b/src/commands/fun/surreal.ts
index 37fe21a..024874a 100644
--- a/src/commands/fun/surreal.ts
+++ b/src/commands/fun/surreal.ts
@@ -16,6 +16,10 @@ module.exports = class SurrealFun extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             examples: [
                 'uwu!surreal please surrealify this'
             ],
diff --git a/src/commands/moderation/addrole.ts b/src/commands/moderation/addrole.ts
index ac0dbb6..93645a2 100644
--- a/src/commands/moderation/addrole.ts
+++ b/src/commands/moderation/addrole.ts
@@ -28,7 +28,12 @@ module.exports = class AddRoleModeration extends Command {
                 'uwu!addrole @sin#1337 @CoolRole',
                 'uwu!roleadd @sin#1337',
                 'uwu!roleadd @sin#1337 @CoolerRole'
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     run(msg: CommandoMessage, { userID, roleID }) {
diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 45f5298..5e9be5e 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -10,7 +10,12 @@ module.exports = class BanModeration extends Command {
             description: 'Ban someone.',
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
-            examples: ['uwu!ban @sin#1337']
+            examples: ['uwu!ban @sin#1337'],
+            guildOnly: true,
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
@@ -19,7 +24,9 @@ module.exports = class BanModeration extends Command {
             msg.reply('Member does not exist in server.')
         } else {
             msg.guild.members.ban(userID)
-            msg.say(`User **${userID}** has been banned!`)
+            msg.say(`User **${userID}** has been banned!`).then(m => {
+                m.react('🇫');
+            })
         }
     }
 };
\ No newline at end of file
diff --git a/src/commands/moderation/clear.ts b/src/commands/moderation/clear.ts
index e83d023..c2f44ab 100644
--- a/src/commands/moderation/clear.ts
+++ b/src/commands/moderation/clear.ts
@@ -5,7 +5,7 @@ module.exports = class ClearBot extends Command {
     constructor(client) {
         super(client, {
             name: 'clear',
-            aliases: ['delete', 'del', 'c', 'd'],
+            aliases: ['delete', 'del', 'c'],
             group: 'bot',
             memberName: 'clear',
             description: 'Clears a specified amount of messages.',
@@ -24,6 +24,10 @@ module.exports = class ClearBot extends Command {
                 'uwu!c 45',
                 'uwu!d 84'
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'MANAGE_MESSAGES'],
 			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'MANAGE_MESSAGES']
         });
@@ -32,23 +36,23 @@ module.exports = class ClearBot extends Command {
         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 });
+                    deleteNotificationMessage.delete({ timeout: 2000 });
+                    msg.delete({ timeout: 2000 })
                 });
             } else if (isNaN(deleteAmount)) {
                 msg.reply('The amount parameter isn\'t a number. ' + emoji.random()).then(deleteNotificationMessage => {
-                    // @ts-ignore
-                    deleteNotificationMessage.delete({ timeout: 1000 });
+                    deleteNotificationMessage.delete({ timeout: 2000 });
+                    msg.delete({ timeout: 2000 })
                 });
             } 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 });
+                    deleteNotificationMessage.delete({ timeout: 2000 });
+                    msg.delete({ timeout: 2000 })
                 });
             } else if (deleteAmount < 1) {
                 msg.reply('You have to delete at least 1 message. ' + emoji.random()).then(deleteNotificationMessage => {
-                    // @ts-ignore
-                    deleteNotificationMessage.delete({ timeout: 1000 });
+                    deleteNotificationMessage.delete({ timeout: 2000 });
+                    msg.delete({ timeout: 2000 })
                 });
             }
             /*else if (msg.createdTimestamp > 1209600) {
@@ -63,11 +67,13 @@ module.exports = class ClearBot extends Command {
                 await msg.channel.messages.fetch({
                     limit: clearAmount
                 }).then(messages => { // I am on v11 discord.js
+                    // why the hell did i put this msg here lol, its 07:56 on 2020/04/27 and i woke up at 6am and i dont really know
+                    // why i put this msg here lol, i am on v12 so that msg mustve been a while ago lol
                     msg.channel.bulkDelete(messages);
                 });
                 msg.reply('It\'s been deleted ~uwu ' + emoji.random()).then(deleteNotificationMessage => {
-                    // @ts-ignore
-                    deleteNotificationMessage.delete({ timeout: 1000 });
+                    deleteNotificationMessage.delete({ timeout: 2000 });
+                    msg.delete({ timeout: 2000 })
                 });
             }
         } else {
diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts
index 24b669d..5f6a789 100644
--- a/src/commands/moderation/kick.ts
+++ b/src/commands/moderation/kick.ts
@@ -14,7 +14,12 @@ module.exports = class KickModeration extends Command {
                 'uwu!kick @sin#1337',
                 'uwu!kickuser @sin#1337',
                 'uwu!kick-user @sin#1337'
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     run(msg: CommandoMessage) {
@@ -23,7 +28,9 @@ module.exports = class KickModeration extends Command {
             msg.reply('Member does not exist in server.')
         } else {
             msg.guild.members.prune(userID)
-            msg.say(`User **${userID}** has been kicked!`)
+            msg.say(`User **${userID}** has been kicked!`).then(m => {
+                m.react('🇫');
+            })
         }
     }
 };
\ No newline at end of file
diff --git a/src/commands/moderation/removerole.ts b/src/commands/moderation/removerole.ts
index a4edc92..d796cb9 100644
--- a/src/commands/moderation/removerole.ts
+++ b/src/commands/moderation/removerole.ts
@@ -20,6 +20,11 @@ module.exports = class RemoveRoleModeration extends Command {
                     type: 'string'
                 }
             ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true,
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY', 'BAN_MEMBERS'],
             examples: [
@@ -37,7 +42,7 @@ module.exports = class RemoveRoleModeration extends Command {
             if (role) {
                 console.log(role)
                 member?.roles.remove(role)
-                msg.reply(`The role **${role}** has been remove from **${member}**.`)
+                msg.reply(`The role **${role}** has been remove from **${member}**!`)
             } else {
                 console.log(role)
                 msg.reply('Role is either non-existant or you might\'ve mispelled it.')
diff --git a/src/commands/server/membercount.ts b/src/commands/server/membercount.ts
index f3fd2ee..7b737ee 100644
--- a/src/commands/server/membercount.ts
+++ b/src/commands/server/membercount.ts
@@ -13,6 +13,7 @@ module.exports = class MemberCountServer extends Command {
                 usages: 5,
                 duration: 30
             },
+            guildOnly: true,
             examples: [
                 'uwu!membercount',
                 'uwu!memberc',
diff --git a/src/commands/server/server.ts b/src/commands/server/server.ts
index 6758d24..a63362b 100644
--- a/src/commands/server/server.ts
+++ b/src/commands/server/server.ts
@@ -16,8 +16,8 @@ module.exports = class ServerServer extends Command {
             memberName: 'server',
             description: 'Gives you information about the current server.',
             throttling: {
-                usages: 2,
-                duration: 60
+                usages: 5,
+                duration: 30
             },
             guildOnly: true,
             examples: [
diff --git a/src/commands/server/welcome.ts b/src/commands/server/welcome.ts
index 9b92268..08a2911 100644
--- a/src/commands/server/welcome.ts
+++ b/src/commands/server/welcome.ts
@@ -2,7 +2,7 @@ import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import Welcome from '../../models/welcome.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9')
+mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = class WelcomeServer extends Command {
     constructor(client) {
@@ -25,7 +25,12 @@ module.exports = class WelcomeServer extends Command {
                     type: 'string',
                     default: ''
                 }
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     async run(msg: CommandoMessage, { wType }) {
@@ -47,15 +52,29 @@ module.exports = class WelcomeServer extends Command {
                     console.log(error)
                 } else if (guild && wType == 'remove') {
                     await Welcome.findOneAndDelete({ guildID: msg.guild.id })
-                    msg.say('The current welcome channel has been unset! ' + emoji.random())
+                    msg.say('The current welcome channel has been unset! ' + emoji.random()).then(mnotif => {
+                        mnotif.delete({ timeout: 2000 })
+                        msg.delete({ timeout: 2000 })
+                    })
                 } else if (!guild && wType == 'remove') {
-                    msg.reply('There is no current welcome channel set for this guild! ' + emoji.random())
-                } else if (wType == 'set') {
+                    msg.reply('There is no current welcome channel set for this guild! ' + emoji.random()).then(mnotif => {
+                        mnotif.delete({ timeout: 2000 })
+                        msg.delete({ timeout: 2000 })
+                    })
+                } else if (guild && wType == 'set') {
+                    msg.reply(`There already is a welcome channel set! It's ${guild.channelname}! ` + emoji.random()).then(mnotif => {
+                        mnotif.delete({ timeout: 2000 })
+                        msg.delete({ timeout: 2000 })
+                    })
+                } else if (!guild && wType == 'set') {
                     await welcome.save()
                         .then(result => console.log(result))
                         .catch(err => console.log(err))
 
-                    msg.reply(`The welcome channel has been set to ${msg.channel}! ` + emoji.random())
+                    msg.reply(`The welcome channel has been set to ${msg.channel}! ` + emoji.random()).then(mnotif => {
+                        mnotif.delete({ timeout: 2000 })
+                        msg.delete({ timeout: 2000 })
+                    })
                 } else if (!guild) {
                     msg.reply('There is no current welcome channel set for this guild! To set one, do `uwu!welcome set` in the channel you want to set it in. ' + emoji.random())
                 } else if (guild) {
diff --git a/src/commands/user/nickname.ts b/src/commands/user/nickname.ts
index ffc8d18..3833f68 100644
--- a/src/commands/user/nickname.ts
+++ b/src/commands/user/nickname.ts
@@ -20,7 +20,12 @@ module.exports = class NickNameUser extends Command {
                 'uwu!nickname sinny',
                 'uwu!nick s1nical',
                 'uwu!name s1n'
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     run(msg: CommandoMessage, { userNick }) {
diff --git a/src/commands/user/pfp.ts b/src/commands/user/pfp.ts
index bf593fa..f6948b3 100644
--- a/src/commands/user/pfp.ts
+++ b/src/commands/user/pfp.ts
@@ -17,7 +17,12 @@ module.exports = class PFPServer extends Command {
                     type: 'string'
                 }
             ],
-            examples: ['uwu!pfp @sin#1337']
+            examples: ['uwu!pfp @sin#1337'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     run(msg: CommandoMessage, { userID } ) {
diff --git a/src/commands/voice/abee.ts b/src/commands/voice/abee.ts
index 2af71af..628909c 100644
--- a/src/commands/voice/abee.ts
+++ b/src/commands/voice/abee.ts
@@ -19,6 +19,10 @@ module.exports = class ABeeVoice extends Command {
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             examples: ['uwu!abee', 'uwu!a-bee'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     async run(msg: CommandoMessage) {
diff --git a/src/commands/voice/itemshop.ts b/src/commands/voice/itemshop.ts
index 76e1f03..e06403f 100644
--- a/src/commands/voice/itemshop.ts
+++ b/src/commands/voice/itemshop.ts
@@ -18,7 +18,11 @@ module.exports = class ABeeVoice extends Command {
             guildOnly: true,
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            examples: ['uwu!itemshop', 'uwu!item-shop']
+            examples: ['uwu!itemshop', 'uwu!item-shop'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     async run(msg: CommandoMessage) {
diff --git a/src/commands/voice/leave.ts b/src/commands/voice/leave.ts
index bdcf259..9ad9984 100644
--- a/src/commands/voice/leave.ts
+++ b/src/commands/voice/leave.ts
@@ -13,6 +13,10 @@ module.exports = class LeaveVoice extends Command {
             examples: ['uwu!leave', 'uwu!end', 'uwu!stop'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/loop.ts b/src/commands/voice/loop.ts
index 4ea9fe7..69cc6a1 100644
--- a/src/commands/voice/loop.ts
+++ b/src/commands/voice/loop.ts
@@ -13,6 +13,10 @@ module.exports = class LoopVoice extends Command {
             examples: ['uwu!loop', 'uwu!repeat'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/minecraft.ts b/src/commands/voice/minecraft.ts
index ea8fb6d..26175d3 100644
--- a/src/commands/voice/minecraft.ts
+++ b/src/commands/voice/minecraft.ts
@@ -24,7 +24,11 @@ module.exports = class MinecraftVoice extends Command {
                 'uwu!minecraft-soundtrack',
                 'uwu!mcs',
                 'uwu!mc-s'
-            ]
+            ],
+            throttling: {
+                usages: 1,
+                duration: 60
+            },
         });
     }
     async run(msg: CommandoMessage) {
diff --git a/src/commands/voice/pause.ts b/src/commands/voice/pause.ts
index c2475d2..1f23661 100644
--- a/src/commands/voice/pause.ts
+++ b/src/commands/voice/pause.ts
@@ -12,6 +12,10 @@ module.exports = class PauseVoice extends Command {
             examples: ['uwu!pause'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/play.ts b/src/commands/voice/play.ts
index b60cb73..17bca2f 100644
--- a/src/commands/voice/play.ts
+++ b/src/commands/voice/play.ts
@@ -30,7 +30,11 @@ module.exports = class PlayVoice extends Command {
             examples: [
                 'uwu!play https://www.youtube.com/watch?v=dQw4w9WgXcQ',
                 'uwu!play despacito'
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     async run(msg: CommandoMessage, { query }) {
diff --git a/src/commands/voice/psycho.ts b/src/commands/voice/psycho.ts
index 115b0b8..8df19f8 100644
--- a/src/commands/voice/psycho.ts
+++ b/src/commands/voice/psycho.ts
@@ -17,7 +17,11 @@ module.exports = class PsychoVoice extends Command {
             guildOnly: true,
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-            examples: ['uwu!psycho']
+            examples: ['uwu!psycho'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     async run(msg: CommandoMessage, { query }) {
diff --git a/src/commands/voice/queue.ts b/src/commands/voice/queue.ts
index 70d6e7c..3516a2e 100644
--- a/src/commands/voice/queue.ts
+++ b/src/commands/voice/queue.ts
@@ -31,6 +31,10 @@ module.exports = class QueueVoice extends Command {
             ],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/remove.ts b/src/commands/voice/remove.ts
index 5d84f0c..41c8cbf 100644
--- a/src/commands/voice/remove.ts
+++ b/src/commands/voice/remove.ts
@@ -19,6 +19,10 @@ module.exports = class RemoveVoice extends Command {
             examples: ['uwu!remove 2'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage, { songNumber }) {
diff --git a/src/commands/voice/resume.ts b/src/commands/voice/resume.ts
index 39874df..ffe150b 100644
--- a/src/commands/voice/resume.ts
+++ b/src/commands/voice/resume.ts
@@ -12,6 +12,10 @@ module.exports = class ResumeVoice extends Command {
             examples: ['uwu!resume'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/shuffle.ts b/src/commands/voice/shuffle.ts
index 8dcd141..bce34ac 100644
--- a/src/commands/voice/shuffle.ts
+++ b/src/commands/voice/shuffle.ts
@@ -13,6 +13,10 @@ module.exports = class ShuffleVoice extends Command {
             examples: ['uwu!shuffle'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/skip.ts b/src/commands/voice/skip.ts
index c8c4c62..8c8740b 100644
--- a/src/commands/voice/skip.ts
+++ b/src/commands/voice/skip.ts
@@ -12,6 +12,10 @@ module.exports = class SkipVoice extends Command {
             examples: ['uwu!skip'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/skipall.ts b/src/commands/voice/skipall.ts
index dbcfeb5..7d8b113 100644
--- a/src/commands/voice/skipall.ts
+++ b/src/commands/voice/skipall.ts
@@ -23,6 +23,10 @@ module.exports = class SkipAllVoice extends Command {
             ],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
diff --git a/src/commands/voice/skipto.ts b/src/commands/voice/skipto.ts
index fab0d68..d11d200 100644
--- a/src/commands/voice/skipto.ts
+++ b/src/commands/voice/skipto.ts
@@ -17,6 +17,10 @@ module.exports = class SkipToVoice extends Command {
             examples: ['uwu!skipto 5'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage, { songNumber }) {
diff --git a/src/commands/voice/volume.ts b/src/commands/voice/volume.ts
index debd798..483653e 100644
--- a/src/commands/voice/volume.ts
+++ b/src/commands/voice/volume.ts
@@ -24,6 +24,10 @@ module.exports = class VolumeVoice extends Command {
             ],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage, { wantedVol }) {
diff --git a/src/commands/zerotwo/darling.ts b/src/commands/zerotwo/darling.ts
index 9999362..18fb3ac 100644
--- a/src/commands/zerotwo/darling.ts
+++ b/src/commands/zerotwo/darling.ts
@@ -2,7 +2,7 @@ import { Command, CommandoMessage } from 'discord.js-commando';
 import emoji from 'emoji-random';
 import Darling from '../../models/darling.js';
 import mongo from 'mongoose';
-mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9')
+mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true })
 
 module.exports = class DarlingZeroTwo extends Command {
     constructor(client) {
@@ -25,7 +25,12 @@ module.exports = class DarlingZeroTwo extends Command {
                     type: 'string',
                     default: ''
                 }
-            ]
+            ],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
+            guildOnly: true
         });
     }
     async run(msg: CommandoMessage, { darlingName }) {
@@ -51,7 +56,9 @@ module.exports = class DarlingZeroTwo extends Command {
                 }
             } else if (!guild && darlingName == 'remove') {
                 msg.reply('There is no darling set in this server. ' + emoji.random())
-            } else if (darlingName == 'set') {
+            } else if (guild && darlingName == 'set') {
+                msg.reply(`I already have a darling! It\'s <@${guild.userID}>! ` + emoji.random())
+            } else if (!guild && darlingName == 'set') {
                 await darling.save()
                 .then(result => console.log(result))
                 .catch(err => console.log(err))
diff --git a/src/commands/zerotwo/douse.ts b/src/commands/zerotwo/douse.ts
index 9ca74ca..cced22d 100644
--- a/src/commands/zerotwo/douse.ts
+++ b/src/commands/zerotwo/douse.ts
@@ -13,12 +13,15 @@ module.exports = class DouseZeroTwo extends Command {
             ],
             userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
             clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+            throttling: {
+                usages: 5,
+                duration: 30
+            },
         });
     }
     run(msg: CommandoMessage) {
         let emb = new MessageEmbed()
             .setColor(0xFFD0DF)
-            .setDescription('And I oop-')
             .setImage('https://i.pinimg.com/originals/6a/c8/26/6ac826e3d0cbd64eb4f42c12a73fcdb8.gif')
         msg.say(emb)
     }
diff --git a/src/config.json b/src/config.json
index 6246952..abf6ad2 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1,5 +1,5 @@
 {
     "secret":"Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A",
     "yt-api-key":"AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8",
-    "version":"7.8.0"
+    "version":"8.0.0"
 }
\ No newline at end of file