clean: clean up some messy shit

4 files changed, 38 insertions, 32 deletions

diff --git a/server/src/commands/mod/Slowmode.ts b/server/src/commands/mod/Slowmode.ts
index 3aec2bd..b352007 100644
--- a/server/src/commands/mod/Slowmode.ts
+++ b/server/src/commands/mod/Slowmode.ts
@@ -42,21 +42,21 @@ export default class SlowmodeMod extends Command {
         try {
             if (amount > 120) {
                 amount = 120;
-                msg.channel.send('Due to Discord API limitations, slow mode can only be a max of **120** seconds or less! Your specified amount has been rounded down to **120** seconds. (This message will automatically be deleted in 3 seconds.)')
-                    .then(m => m.delete({ timeout: 3000 }));
+                msg.channel.send('Due to Discord API limitations, slow mode can only be a max of **120** seconds or less! Your specified amount has been rounded down to **120** seconds. (This message will automatically be deleted in 10 seconds.)')
+                    .then(m => m.delete({ timeout: 10000 }));
             }
             
             (msg.channel as TextChannel).setRateLimitPerUser(amount);
             if (realtime) {
                 let time = 60000 * realtime;
-                msg.channel.send(`Slowmode has now been set to ${amount} seconds and will end in ${realtime} minutes!`);
+                msg.channel.send(`Slowmode has now been set to **${amount}** seconds and will end in **${realtime}** minutes!`);
                 setTimeout(() => {
                     (msg.channel as TextChannel).setRateLimitPerUser(0);
                     return msg.channel.send('Slowmode has now been disabled!');
                 }, time);
             } else {
                 if (amount == 0) return msg.channel.send('Slowmode has now been disabled!');
-                return msg.channel.send(`Slowmode has now been set to ${amount} seconds!`);
+                return msg.channel.send(`Slowmode has now been set to **${amount}** seconds!`);
             }
         } catch (err) {
             console.error(err);
diff --git a/server/src/commands/server/Server.ts b/server/src/commands/server/Server.ts
index 7caf899..20e023b 100644
--- a/server/src/commands/server/Server.ts
+++ b/server/src/commands/server/Server.ts
@@ -24,7 +24,7 @@ export default class ServerServer extends Command {
         
         const embed = this.client.util.embed()
             .setAuthor(`${msg.guild.name} - ${msg.guild.id}`, `${msg.guild.iconURL()}`, `https://discordapp.com/channels/${msg.guild.id}/${msg.guild.id}`)
-            .setDescription(`Heres's all the information on \`${msg.guild.name}\``)
+            .setDescription(`Here's all the information on \`${msg.guild.name}\``)
             .setThumbnail(`${msg.guild.iconURL()}`)
             .addField('Owner', `\`${msg.guild.owner.user.tag}\``)
             .addField(`Members [${msg.guild.memberCount}]`, `${online} members are online.`, true)
diff --git a/server/src/listeners/client/ReadyListener.ts b/server/src/listeners/client/ReadyListener.ts
index 706e223..0260248 100644
--- a/server/src/listeners/client/ReadyListener.ts
+++ b/server/src/listeners/client/ReadyListener.ts
@@ -21,9 +21,23 @@ export default class ReadyListener extends Listener {
     public exec(): void {
         console.log(`${this.client.user.tag} is now online and ready!`);
         
-        /* const activities: ReactionStatus[] = [
+        const activities: ReactionStatus[] = [
             {
-                text: 'uwu$help',
+                text: 'uwu!help',
+                type: 'WATCHING'
+            },
+            {
+                text: `${this.client.channels.cache.size.toLocaleString('en-US')} Channels`,
+                type: 'WATCHING'
+            },
+            {
+                text: `${this.client.guilds.cache
+                    .reduce((prev, val) => prev + val.memberCount, 0)
+                    .toLocaleString('en-US')} Members`,
+                type: 'WATCHING'
+            },
+            {
+                text: 'kyzer.co',
                 type: 'WATCHING'
             }
         ]
@@ -35,12 +49,12 @@ export default class ReadyListener extends Listener {
             this.client.user!.setActivity(status.value.text, { type: status.value.type });
         }, 300000);
         
-        setInterval(() => this._clearPresences(), 9e5); */
+        setInterval(() => this._clearPresences(), 9e5);
         
         new API(this.client).start();
     }
     
-    /* private _clearPresences(): void {
+    private _clearPresences(): void {
         const i = this.client.guilds.cache.reduce((acc: number, g: Guild): number => {
             acc += g.presences.cache.size;
             g.presences.cache.clear();
@@ -55,5 +69,5 @@ export default class ReadyListener extends Listener {
             yield arr[i];
             i = (i + 1) % arr.length;
         }
-    } */
+    }
 }
\ No newline at end of file
diff --git a/server/src/listeners/client/message.ts b/server/src/listeners/client/message.ts
index bcad42c..071c310 100644
--- a/server/src/listeners/client/message.ts
+++ b/server/src/listeners/client/message.ts
@@ -13,35 +13,27 @@ export default class MessageListener extends Listener {
 
 	public exec(msg: Message): void {
 		if (msg.mentions.everyone) msg.react('👀');
-		
-		const waterVariations = [
-			'water',
-			'wader',
-			'wahter',
-			'wahder',
-			'wata',
-			'wateer'
-		];
-		
+
 		if (msg.guild.id === emmaServer) {
-			if (waterVariations.includes(msg.content.toLowerCase())) {
+			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.react('733894420700594187');
     	        msg.react('732062891162992720');
 			}
 		}
 		
-		const uglyVariations = [
-			'ugly',
-			'ugy',
-			'ugyy',
-			'uggy',
-			'ugee',
-			'uggly',
-			'uglee'
-		];
-		
 		if (msg.guild.id === emmaServer) {
-			if (uglyVariations.includes(msg.content.toLowerCase())) {
+			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.react('733301856054280253');
 			}
 		}