From 41628e583e36cd1d012f8ee2c09bed983e112de7 Mon Sep 17 00:00:00 2001 From: Brandon Rozek Date: Sun, 14 Aug 2016 20:20:35 -0400 Subject: [PATCH] Replaced regex expression with tokens due to yo-lkajdfasad hello-adkflajfd and other random garbage being accepted --- lib/commands/naturalSpeech.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/commands/naturalSpeech.js b/lib/commands/naturalSpeech.js index e66da64..bd320c0 100644 --- a/lib/commands/naturalSpeech.js +++ b/lib/commands/naturalSpeech.js @@ -1,6 +1,5 @@ var Command = require('./Command.js'); var grabTokens = require('../helpers/grabTokens.js'); -var greetings = "hello|hi|hey|yo|morning|afternoon|evening"; var happy = "yay|woo|yess|:D|:\\)" var url = "link|url"; @@ -15,7 +14,7 @@ var condition = function(text, userData) { (new RegExp(happy, 'i').test(text)) || ((tokens.contain("who") || tokens.contain("what")) && tokens.contain("brandon") && tokens.contain('rozek')) || ((tokens.contain("how") || tokens.contain("doing") || tokens.contain("up")) && tokens.contain("brandon")) || - ((tokens.superContain('rozbot') || privateMessage) && new RegExp(greetings, 'i').test(text)) || + ((tokens.superContain('rozbot') || privateMessage) && (tokens.contain("hello") || tokens.contain("hi") || tokens.contain("hey") || tokens.contain("yo") || tokens.contain("morning") || tokens.contain("afternoon") || tokens.contain("evening"))) || ((tokens.superContain("rozbot") || privateMessage) && tokens.superContain("what") && (tokens.contain("up") || tokens.contain("doing"))) || (tokens.superContain("rozbot") && tokens.superContain("what") && tokens.contain("job")) } @@ -83,7 +82,7 @@ module.exports = new Command("NaturalSpeech", condition, function(text, send, us /* Good morning Rozbot! -> Hello [user]! */ - else if ((tokens.superContain('rozbot') || privateMessage) && new RegExp(greetings, 'i').test(text)) { + else if ((tokens.superContain('rozbot') || privateMessage) && (tokens.contain("hello") || tokens.contain("hi") || tokens.contain("hey") || tokens.contain("yo") || tokens.contain("morning") || tokens.contain("afternoon") || tokens.contain("evening"))) { send("Hello " + from + "!"); } /*