summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
author8cy <[email protected]>2020-07-24 07:51:34 -0700
committer8cy <[email protected]>2020-07-24 07:51:34 -0700
commitedc99b72dbaedeeee8ba3b23729122ff3279ae1a (patch)
treef9f516e7fe9a187d31947b7efa843b725703cb16 /server/src
parentclean: clean up some messy shit (diff)
downloaddep-core-edc99b72dbaedeeee8ba3b23729122ff3279ae1a.tar.xz
dep-core-edc99b72dbaedeeee8ba3b23729122ff3279ae1a.zip
fix: water and ugy command using && instead of ||
Diffstat (limited to 'server/src')
-rw-r--r--server/src/listeners/client/guildCreate.ts3
-rw-r--r--server/src/listeners/client/message.ts22
2 files changed, 13 insertions, 12 deletions
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');
}
}