big changes, too lazy to count, v7.6.0

mainly just fix darling

3 files changed, 67 insertions, 6 deletions

diff --git a/src/commands/fun/8ball.ts b/src/commands/fun/8ball.ts
index 2ba8fc4..5fc6ad7 100644
--- a/src/commands/fun/8ball.ts
+++ b/src/commands/fun/8ball.ts
@@ -1,5 +1,6 @@
 import { Command, CommandoMessage } from 'discord.js-commando';
 import { MessageEmbed } from 'discord.js';
+import emoji from 'emoji-random'
 
 module.exports = class EightBallFun extends Command {
 	constructor(client) {
@@ -19,18 +20,56 @@ module.exports = class EightBallFun extends Command {
 				usages: 5,
 				duration: 30
 			},
-			examples: ['uwu!8ball', 'uwu!8b'],
+			examples: ['uwu!8ball', 'uwu!8b 002'],
 			userPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
-			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY']
+			clientPermissions: ['SEND_MESSAGES', 'READ_MESSAGE_HISTORY'],
+			args: [
+				{
+					key: 'bType',
+					prompt: 'What type of 8ball would you like?',
+					type: 'string',
+					default: ''
+				}
+			]
 		});
 	}
-	run(msg: CommandoMessage) {
-		var r = ['yes~ uwu', 'no.', 'yes!', 'no!', 'what, no.', 'yes.', 'maybe.', 'perhaps.', 'try again.', 'I\'m not sure.'];
+	run(msg: CommandoMessage, { bType }) {
+		if (bType == 'darling' || bType == '002' || bType == 'zero two' || bType == 'zero-two') {
+			var r = [
+				'Maybe, darling.',
+				'Certainly not, darling.',
+				'I hope so, darling.',
+				'Not in our wildest dreams, darling.',
+				'There is a good chance, darling.',
+				'Quite likely, darling.',
+				'I think so, darling.',
+				'I hope not, darling.',
+				'I hope so, darling.',
+				'Never!',
+				'Ahaha! Really?!? XD',
+				'Hell, yes.',
+				'Hell to the no.',
+				'The future is bleak, darling',
+				'The future is uncertain, darling',
+				'I would rather not say, darling',
+				'Who cares?',
+				'Possibly, darling',
+				'Never, ever, ever... ever.',
+				'There is a small chance, darling.',
+				'Yes, darling!'
+			]
+		} else if (bType) {
+			msg.reply('Arguments? Try `uwu!8ball 002`. ' + emoji.random())
+			var r = ['yes~ uwu', 'no.', 'yes!', 'no!', 'what, no.', 'yes.', 'maybe.', 'perhaps.', 'try again.', 'I\'m not sure.'];
+		} else {
+			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')
-		    .setDescription('`' + s + '`');
+			.setAuthor('The 8-ball says', 'https://upload.wikimedia.org/wikipedia/commons/thumb/f/fd/8-Ball_Pool.svg/500px-8-Ball_Pool.svg.png')
+			.setDescription('`' + s + '`');
 
 		msg.channel.send(embed);
 	}
diff --git a/src/commands/fun/hello.ts b/src/commands/fun/hello.ts
new file mode 100644
index 0000000..e4d06f3
--- /dev/null
+++ b/src/commands/fun/hello.ts
@@ -0,0 +1,21 @@
+import { Command, CommandoMessage } from 'discord.js-commando';
+import emoji from 'emoji-random';
+
+module.exports = class HelloFun extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'hello',
+            aliases: ['hey', 'hi'],
+            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']
+        });
+    }
+    run(msg: CommandoMessage) {
+        msg.reply('Hi! ' + emoji.random())
+    }
+};
\ No newline at end of file
diff --git a/src/commands/fun/howify.ts b/src/commands/fun/howify.ts
index e7e7eb6..6529975 100644
--- a/src/commands/fun/howify.ts
+++ b/src/commands/fun/howify.ts
@@ -20,6 +20,7 @@ module.exports = class HowifyFun extends Command {
             // fs.unlinkSync('../../../node_modules/howifier/images/blissgay.jpeg')
             msg.attachments.forEach(async attachment => {
                 var u1 = await how(attachment.url);
+                msg.delete()
                 setTimeout(() => {
                     msg.say({ files: [u1] })
                 }, 2000);