Merge pull request #140 from destinygg/ban-phrase-regex-check

Test regex when adding a new phrase.

Author: 11k

lib/commands/implementations/banphrase.js

@@ -9,15 +9,26 @@ function banphrase(defaultPunishmentDuration, punishmentType) {
     const duration = _.get(matched, 1, '');
     const bannedPhrase = _.get(matched, 2, '').toLowerCase();
     let parsedDuration = defaultPunishmentDuration;
+
     if (duration !== '') {
       parsedDuration = parseDurationToSeconds(duration);
       if (parsedDuration === null) {
-        return new CommandOutput(
+        return new Promise.resolve(new CommandOutput(
           null,
           'Could not parse the duration. Usage: "!AddX {amount}{m,h,d,w} {some banned phrase} " !AddMute 1d YOU BEEN GNOMED',
-        );
+        ));
       }
     }
+
+    if (/^\/.*\/$/.test(bannedPhrase)) {
+      try {
+        // eslint-disable-next-line no-new
+        new RegExp(bannedPhrase);
+      } catch (e) {
+        return new Promise.resolve(new CommandOutput(null, 'Could not add phrase. Invalid Regex.'));
+      }
+    }
+
     return services.sql
       .addBannedPhrase(bannedPhrase, parsedDuration, punishmentType)
       .then(() => {
@@ -32,7 +43,7 @@ function banphrase(defaultPunishmentDuration, punishmentType) {
         if (err.errno === 19) {
           return new CommandOutput(null, 'Phrase already banned!');
         }
-        return new Command(err, 'Oops. Something did not work. Check the logs.');
+        return new CommandOutput(err, 'Oops. Something did not work. Check the logs.');
       });
   };
 }