Merge pull request #160 from destinygg/fix/nuke-cleanse-crash

fix: chat crashing on cleansing regex nukes

Author: 11k

lib/services/punishment-cache.js

@@ -75,19 +75,21 @@ class PunishmentCache {
   }
 
   cleanseSingleNuke(nukeToRemove) {
-    this.nukedPhrases = this.nukedPhrases.filter(
-      (nukedPhrase) => {
-        const curPhrase = (nukedPhrase.phrase instanceof RegExp) ? nukedPhrase.phrase.toString() : nukedPhrase.phrase
-        return curPhrase.toLowerCase() !== nukeToRemove.toLowerCase()
-      },
-    );
-
-    this.aegisCache = this.aegisCache.filter(
-      (nukedPhrase) => {
-        const curPhrase = (nukedPhrase.nukedPhrase instanceof RegExp) ? nukedPhrase.nukedPhrase.toString() : nukedPhrase.nukedPhrase
-        return curPhrase.toLowerCase() !== nukeToRemove.toLowerCase()
-      },
-    );
+    const nuke = nukeToRemove instanceof RegExp ? nukeToRemove.toString() : nukeToRemove;
+
+    this.nukedPhrases = this.nukedPhrases.filter((nukedPhrase) => {
+      const curPhrase =
+        nukedPhrase.phrase instanceof RegExp ? nukedPhrase.phrase.toString() : nukedPhrase.phrase;
+      return curPhrase.toLowerCase() !== nuke.toLowerCase();
+    });
+
+    this.aegisCache = this.aegisCache.filter((nukedPhrase) => {
+      const curPhrase =
+        nukedPhrase.nukedPhrase instanceof RegExp
+          ? nukedPhrase.nukedPhrase.toString()
+          : nukedPhrase.nukedPhrase;
+      return curPhrase.toLowerCase() !== nuke.toLowerCase();
+    });
   }
 
   cleanseNukes() {
@@ -98,7 +100,7 @@ class PunishmentCache {
   getNukedUsersForPhrase(nukePhrase) {
     const users = [];
     _.forIn(this.singleUserAegisCache, (value, key) => {
-      const curValue = (value.phrase instanceof RegExp) ? value.phrase.toString() : value.phrase
+      const curValue = value.phrase instanceof RegExp ? value.phrase.toString() : value.phrase;
       if (curValue.toLowerCase() === nukePhrase.toLowerCase()) {
         users.push(key);
       }