From edc99b72dbaedeeee8ba3b23729122ff3279ae1a Mon Sep 17 00:00:00 2001
From: 8cy <50817549+8cy@users.noreply.github.com>
Date: Fri, 24 Jul 2020 07:51:34 -0700
Subject: fix: water and ugy command using && instead of ||

---
 server/src/listeners/client/guildCreate.ts |  3 ++-
 server/src/listeners/client/message.ts     | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'server/src')

diff --git a/server/src/listeners/client/guildCreate.ts b/server/src/listeners/client/guildCreate.ts
index f649e2c..8196993 100644
--- a/server/src/listeners/client/guildCreate.ts
+++ b/server/src/listeners/client/guildCreate.ts
@@ -1,5 +1,6 @@
 import { Listener } from 'discord-akairo';
 import { Guild } from 'discord.js';
+import { prefix } from '../../Config';
 
 export default class GuildCreateListener extends Listener {
 	public constructor() {
@@ -16,7 +17,7 @@ export default class GuildCreateListener extends Listener {
 			this.client.settings.new('guild', {
 				id: guild.id,
 				premium: false,
-				prefix: process.env.PREFIX || 'r!',
+				prefix,
 			});
 		}
 	}
diff --git a/server/src/listeners/client/message.ts b/server/src/listeners/client/message.ts
index 071c310..84a8833 100644
--- a/server/src/listeners/client/message.ts
+++ b/server/src/listeners/client/message.ts
@@ -16,11 +16,11 @@ export default class MessageListener extends Listener {
 
 		if (msg.guild.id === emmaServer) {
 			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('wader')
+				|| msg.content.toLowerCase().includes('wahter')
+				|| msg.content.toLowerCase().includes('wahder')
+				|| msg.content.toLowerCase().includes('wata')
+				|| msg.content.toLowerCase().includes('wateer')) {
 				msg.react('733894420700594187');
     	        msg.react('732062891162992720');
 			}
@@ -28,12 +28,12 @@ export default class MessageListener extends Listener {
 		
 		if (msg.guild.id === emmaServer) {
 			if (msg.content.toLowerCase().includes('ugly')
-			&& msg.content.toLowerCase().includes('ugy')
-			&& msg.content.toLowerCase().includes('ugyy')
-			&& msg.content.toLowerCase().includes('uggy')
-			&& msg.content.toLowerCase().includes('ugee')
-			&& msg.content.toLowerCase().includes('uggly')
-			&& msg.content.toLowerCase().includes('uglee')) {
+				|| msg.content.toLowerCase().includes('ugy')
+				|| msg.content.toLowerCase().includes('ugyy')
+				|| msg.content.toLowerCase().includes('uggy')
+				|| msg.content.toLowerCase().includes('ugee')
+				|| msg.content.toLowerCase().includes('uggly')
+				|| msg.content.toLowerCase().includes('uglee')) {
 				msg.react('733301856054280253');
 			}
 		}
-- 
cgit v1.2.3