move assets around, v7.3.0

24 files changed, 13 insertions, 76 deletions

diff --git a/src/assets/audio/farts/1.mp3 b/src/assets/audio/farts/1.mp3
new file mode 100644
index 0000000..39c85c7
--- /dev/null
+++ b/src/assets/audio/farts/1.mp3
diff --git a/src/assets/audio/farts/2.mp3 b/src/assets/audio/farts/2.mp3
new file mode 100644
index 0000000..ee702d8
--- /dev/null
+++ b/src/assets/audio/farts/2.mp3
diff --git a/src/assets/audio/farts/3.mp3 b/src/assets/audio/farts/3.mp3
new file mode 100644
index 0000000..f9179ad
--- /dev/null
+++ b/src/assets/audio/farts/3.mp3
diff --git a/src/assets/audio/farts/4.mp3 b/src/assets/audio/farts/4.mp3
new file mode 100644
index 0000000..2a88503
--- /dev/null
+++ b/src/assets/audio/farts/4.mp3
diff --git a/src/assets/audio/farts/5.mp3 b/src/assets/audio/farts/5.mp3
new file mode 100644
index 0000000..b4ccf9d
--- /dev/null
+++ b/src/assets/audio/farts/5.mp3
diff --git a/src/assets/audio/farts/6.mp3 b/src/assets/audio/farts/6.mp3
new file mode 100644
index 0000000..f57c501
--- /dev/null
+++ b/src/assets/audio/farts/6.mp3
diff --git a/src/assets/audio/farts/7.mp3 b/src/assets/audio/farts/7.mp3
new file mode 100644
index 0000000..5ea9d51
--- /dev/null
+++ b/src/assets/audio/farts/7.mp3
diff --git a/src/assets/audio/farts/8.mp3 b/src/assets/audio/farts/8.mp3
new file mode 100644
index 0000000..d135519
--- /dev/null
+++ b/src/assets/audio/farts/8.mp3
diff --git a/src/assets/audio/longest_fart_ever.mp3 b/src/assets/audio/longest_fart_ever.mp3
new file mode 100644
index 0000000..82b11e1
--- /dev/null
+++ b/src/assets/audio/longest_fart_ever.mp3
diff --git a/src/assets/audio/squeak.wav b/src/assets/audio/squeak.wav
new file mode 100644
index 0000000..fea330b
--- /dev/null
+++ b/src/assets/audio/squeak.wav
diff --git a/src/assets/audio/uhhhh.wav b/src/assets/audio/uhhhh.wav
new file mode 100644
index 0000000..f8dfb24
--- /dev/null
+++ b/src/assets/audio/uhhhh.wav
diff --git a/src/assets/audio/wahoo.mp3 b/src/assets/audio/wahoo.mp3
new file mode 100644
index 0000000..b507034
--- /dev/null
+++ b/src/assets/audio/wahoo.mp3
diff --git a/src/bot.ts b/src/bot.ts
index 6ebb614..c31d560 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -1,6 +1,6 @@
 import config from './config.json';
 import { CommandoClient } from 'discord.js-commando';
-import WS  from './ws/ws';
+//import WS  from './ws/ws';
 import path from 'path';
 import { Structures, MessageAttachment } from 'discord.js';
 import emoji from 'emoji-random';
@@ -24,7 +24,7 @@ const client = new CommandoClient({
     owner: '217348698294714370'
 });
 
-var ws = new WS('123456', process.env.PORT, client)
+//var ws = new WS('123456', process.env.PORT, client)
 
 client.registry
     .registerDefaultTypes()
@@ -62,7 +62,7 @@ client.once('ready', () => {
     console.log('\x1b[0m' + 'Servers: ' + '\x1b[36m' + `${client.guilds.cache.size}` + '\x1b[0m')
     console.log()
     
-    client.user.setActivity('uwu!help | v7.2.0', {
+    client.user.setActivity('uwu!help | v7.3.0', {
         type: 'WATCHING'
     });
 });
diff --git a/src/commands/anime/neko.ts b/src/commands/anime/neko.ts
index 883b429..26c37c7 100644
--- a/src/commands/anime/neko.ts
+++ b/src/commands/anime/neko.ts
@@ -9,7 +9,7 @@ module.exports = class NekoAnime extends Command {
             aliases: ['kemonomimi', 'nekoslife', 'nekos-life', 'nekos.life'],
             group: 'anime',
             memberName: 'neko',
-            description: 'Neko.',
+            description: 'Allows you to choose from a wide variety of Neko images. (NSFW and SFW)',
             nsfw: false,
             examples: [
                 'uwu!neko',
diff --git a/src/commands/crypto/btc.ts b/src/commands/crypto/btc.ts
index c0c14f3..1c467ab 100644
--- a/src/commands/crypto/btc.ts
+++ b/src/commands/crypto/btc.ts
@@ -10,7 +10,7 @@ module.exports = class BTCUtility extends Command {
             aliases: ['bitcoin', 'crypto'],
             group: 'utility',
             memberName: 'btc',
-            description: 'Allows you to check current Bitcoin price.',
+            description: 'Allows you to check the current Bitcoin price.',
             args: [
                 {
                     key: 'currencyName',
diff --git a/src/commands/fun/dm.ts b/src/commands/fun/dm.ts
deleted file mode 100644
index 73fa0b6..0000000
--- a/src/commands/fun/dm.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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/emoji.ts b/src/commands/fun/emoji.ts
index 2950738..f830387 100644
--- a/src/commands/fun/emoji.ts
+++ b/src/commands/fun/emoji.ts
@@ -8,7 +8,7 @@ module.exports = class EmojiFun extends Command {
             aliases: ['moji'],
             group: 'fun',
             memberName: 'emoji',
-            description: 'Gives you a random emoji.' + emoji.random(),
+            description: 'Gives you a random emoji. ' + emoji.random(),
             throttling: {
                 usages: 5,
                 duration: 30
diff --git a/src/commands/fun/gay.ts b/src/commands/fun/gay.ts
index a522cf9..6ca5138 100644
--- a/src/commands/fun/gay.ts
+++ b/src/commands/fun/gay.ts
@@ -11,7 +11,7 @@ module.exports = class GayFun extends Command {
             ],
             group: 'fun',
             memberName: 'gay',
-            description: 'Tells you your gay-ness amount.',
+            description: 'Tells you your level of homosexuality amount. Because we\'re all queens here.🏳️‍🌈 ',
             examples: [
                 'uwu!gay',
                 'uwu!gayamount',
diff --git a/src/commands/fun/lorem.ts b/src/commands/fun/lorem.ts
index c1d0e0e..c970247 100644
--- a/src/commands/fun/lorem.ts
+++ b/src/commands/fun/lorem.ts
@@ -9,7 +9,7 @@ module.exports = class LoremFun extends Command {
             aliases: ['lorem-impsum', 'loremipsum', 'ipsum', 'lorem-memesum', 'loremmemesum', 'memesum'],
             group: 'fun',
             memberName: 'lorem',
-            description: 'Gives you a random memeified Lorem Ipsum',
+            description: 'Gives you a random memeified Lorem Ipsum.',
             examples: [
                 'uwu!lorem',
                 'uwu!lorem-ipsum',
diff --git a/src/commands/utility/servercount.ts b/src/commands/utility/servercount.ts
index b3ce320..eaccd89 100644
--- a/src/commands/utility/servercount.ts
+++ b/src/commands/utility/servercount.ts
@@ -19,7 +19,7 @@ module.exports = class ServerCountUtility extends Command {
             m.edit(`** **`);
 
             let emb = new MessageEmbed()
-                .setDescription(`Currently running on 31${this.client.guilds.cache.size} server(s). ` + emoji.random())
+                .setDescription(`Currently running on ${this.client.guilds.cache.size} server(s). ` + emoji.random())
                 .setColor(0xFFCC4D)
 
             msg.channel.send(emb);
diff --git a/src/commands/voice/join.ts b/src/commands/voice/join.ts
index ce414f4..9633e14 100644
--- a/src/commands/voice/join.ts
+++ b/src/commands/voice/join.ts
@@ -7,7 +7,7 @@ module.exports = class JoinVoice extends Command {
             name: 'join',
             group: 'voice',
             memberName: 'join',
-            description: 'Joins your current voice channel.',
+            description: 'Joins your current voice channel. (kinda broken, if you use this command, you won\'t be able to use uwu!leave.)',
             throttling: {
                 usages: 2,
                 duration: 5
diff --git a/src/commands/voice/loop.ts b/src/commands/voice/loop.ts
index a3bda2a..4ea9fe7 100644
--- a/src/commands/voice/loop.ts
+++ b/src/commands/voice/loop.ts
@@ -8,7 +8,7 @@ module.exports = class LoopVoice extends Command {
             aliases: ['repeat'],
             group: 'voice',
             memberName: 'loop',
-            description: 'Loops currently playing audio.',
+            description: 'Loops currently playing track.',
             guildOnly: true,
             examples: ['uwu!loop', 'uwu!repeat'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
diff --git a/src/commands/voice/queue.ts b/src/commands/voice/queue.ts
index b92852a..70d6e7c 100644
--- a/src/commands/voice/queue.ts
+++ b/src/commands/voice/queue.ts
@@ -17,7 +17,7 @@ module.exports = class QueueVoice extends Command {
             ],
             group: 'voice',
             memberName: 'queue',
-            description: 'Displays the current queue.',
+            description: 'Displays the current track queue.',
             guildOnly: true,
             examples: [
                 'uwu!queue',
diff --git a/src/commands/voice/shuffle.ts b/src/commands/voice/shuffle.ts
index c50181f..8dcd141 100644
--- a/src/commands/voice/shuffle.ts
+++ b/src/commands/voice/shuffle.ts
@@ -8,7 +8,7 @@ module.exports = class ShuffleVoice extends Command {
             name: 'shuffle',
             group: 'voice',
             memberName: 'shuffle',
-            description: 'Shuffles the current queue.',
+            description: 'Shuffles the current track queue.',
             guildOnly: true,
             examples: ['uwu!shuffle'],
             clientPermissions: ['SPEAK', 'CONNECT', 'SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],