combo: stuff

fix:
- fix error handling
- fix some gb/wc msgs formatting

feat:
- ditf 8ball
- anti fiji gang
- 1/1000 gm/wc

6 files changed, 51 insertions, 21 deletions

diff --git a/server/src/commands/minigames/8Ball.ts b/server/src/commands/minigames/8Ball.ts
index 2ff3904..10bf06d 100644
--- a/server/src/commands/minigames/8Ball.ts
+++ b/server/src/commands/minigames/8Ball.ts
@@ -15,12 +15,24 @@ export default class EightBallMinigames extends Command {
                     'will I ever get married?'
                 ]
             },
-            ratelimit: 3
+            ratelimit: 3,
+            args: [
+                {
+                    id: 'darlinginthefranxx',
+                    flag: ['-ditf'],
+                    match: 'flag'
+                }
+            ]
         });
     }
     
-    public exec(msg: Message): Promise<Message> {
-        let randomResponse = EightBallResponses.standard[Math.floor(Math.random() * EightBallResponses.standard.length)];
+    public exec(msg: Message, { darlinginthefranxx }): Promise<Message> {
+        let randomResponse;
+        if (darlinginthefranxx)
+            randomResponse = EightBallResponses.standard[Math.floor(Math.random() * EightBallResponses.standard.length)];
+        else 
+            randomResponse = EightBallResponses.ditf[Math.floor(Math.random() * EightBallResponses.ditf.length)];
+
         const embed = this.client.util.embed()
             .setColor(colour)
             .setAuthor('The 8-ball says',
diff --git a/server/src/json/guildMemberAdd.json b/server/src/json/guildMemberAdd.json
index 0cab300..c79e360 100644
--- a/server/src/json/guildMemberAdd.json
+++ b/server/src/json/guildMemberAdd.json
@@ -1,8 +1,8 @@
 [
     "showed up!",
-    "finally showed up",
+    "finally showed up.",
     "has entered the swamp.",
-    "used warpseed to get here!",
+    "used warp-speed to get here!",
     "has entered the Gulag.",
     "has come to end Dio."
 ]
\ No newline at end of file
diff --git a/server/src/json/guildMemberRemove.json b/server/src/json/guildMemberRemove.json
index 36e628e..65f6566 100644
--- a/server/src/json/guildMemberRemove.json
+++ b/server/src/json/guildMemberRemove.json
@@ -1,5 +1,5 @@
 [
-    "used warpspeed.",
+    "used warp-speed.",
     "was Thanos snapped out of existence!",
     "has left the server.",
     "fled the scene.",
diff --git a/server/src/listeners/client/guildMemberAdd.ts b/server/src/listeners/client/guildMemberAdd.ts
index 41f7f50..8d9263c 100644
--- a/server/src/listeners/client/guildMemberAdd.ts
+++ b/server/src/listeners/client/guildMemberAdd.ts
@@ -15,12 +15,17 @@ export default class GuildMemberAddListener extends Listener {
 	public exec(member: GuildMember): void {
         Welcome.findOne({ guildID: member.guild.id }, async (error, g) => {
 			if (error) return this.client.logger.error(`[CLIENT ERROR] ${error}`);
-            
-			const leaveMessage = await wMRResponses[Math.floor(Math.random() * wMRResponses.length)];
-            //@ts-ignore
-			if (g) return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) ${leaveMessage}`);
-            
-            return;
+			if (!g) return;
+
+			const secret = Math.floor(Math.random() * 1000);
+			if (secret === 420) {
+				//@ts-ignore
+				return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) has just got the secret welcome message! They had a 1/1000 chance of getting this! ✨`);
+			} else {
+				const leaveMessage = await wMRResponses[Math.floor(Math.random() * wMRResponses.length)];
+				//@ts-ignore
+				return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) ${leaveMessage}`);
+			}
         });
 	}
 }
diff --git a/server/src/listeners/client/guildMemberRemove.ts b/server/src/listeners/client/guildMemberRemove.ts
index f7b774e..eacdd6b 100644
--- a/server/src/listeners/client/guildMemberRemove.ts
+++ b/server/src/listeners/client/guildMemberRemove.ts
@@ -15,13 +15,17 @@ export default class GuildMemberRemoveListener extends Listener {
 	public exec(member: GuildMember): void {
         Goodbye.findOne({ guildID: member.guild.id }, async (error, g) => {
 			if (error) return this.client.logger.error(`[CLIENT ERROR] ${error}`);
-			
-			const leaveMessage = await gMRResponses[Math.floor(Math.random() * gMRResponses.length)];
-            //@ts-ignore
-			if (g) return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) ${leaveMessage}`)
-				.then(m => { m.react('🇫') });
-            
-            return;
+			if (!g) return;
+
+			const secret = Math.floor(Math.random() * 1000);
+			if (secret === 420) {
+				//@ts-ignore
+				return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) has just got the secret goodbye message! They had a 1/1000 chance of getting this! ✨`);
+			} else {
+				const leaveMessage = await gMRResponses[Math.floor(Math.random() * gMRResponses.length)];
+				//@ts-ignore
+				return member.guild.channels.cache.get(g.channelID).send(`${member.user.tag} (<@${member.id}>) ${leaveMessage}`);
+			}
         });
 	}
 }
diff --git a/server/src/listeners/client/message.ts b/server/src/listeners/client/message.ts
index 84a8833..429f3cc 100644
--- a/server/src/listeners/client/message.ts
+++ b/server/src/listeners/client/message.ts
@@ -12,15 +12,24 @@ export default class MessageListener extends Listener {
 	}
 
 	public exec(msg: Message): void {
+		if (msg.channel.type === 'dm') return;
+
 		if (msg.mentions.everyone) msg.react('👀');
 
 		if (msg.guild.id === emmaServer) {
-			if (msg.content.toLowerCase().includes('water')
+			if ((msg.content.toLowerCase().includes('water')
 				|| msg.content.toLowerCase().includes('wader')
 				|| msg.content.toLowerCase().includes('wahter')
 				|| msg.content.toLowerCase().includes('wahder')
 				|| msg.content.toLowerCase().includes('wata')
-				|| msg.content.toLowerCase().includes('wateer')) {
+				|| msg.content.toLowerCase().includes('wateer'))
+				&& !(msg.content.toLowerCase().includes('fiji')
+				|| msg.content.toLowerCase().includes('fiiji')
+				|| msg.content.toLowerCase().includes('fijii')
+				|| msg.content.toLowerCase().includes('fiijii')
+				|| msg.content.toLowerCase().includes('fijjii')
+				|| msg.content.toLowerCase().includes('fiijji')
+				|| msg.content.toLowerCase().includes('fijji'))) {
 				msg.react('733894420700594187');
     	        msg.react('732062891162992720');
 			}