Fixed cleverbot

bonnici · Efreak · commit 7b4bca1a072a · 2015-07-22T03:06:06.000-07:00
Conflicts:
	lib/triggers/cleverbotTrigger.js
	package.json

Conflicts:
	package.json
diff --git a/lib/triggers/cleverbotTrigger.js b/lib/triggers/cleverbotTrigger.js
@@ -54,15 +54,15 @@ CleverbotTrigger.prototype._respond = function(toId, message) {
 		this.winston.info("Sending cleverbot request with params:");
 		this.winston.info(this.cleverbot.params);
 		var that = this;
-		this.cleverbot.write(message, function(response) {
-			that.winston.info("Cleverbot responded with params:");
-			that.winston.info(that.cleverbot.params);
-			if (response.message === "<html>") {
-				that.cleverbot.params.sessionid = "";
-			}
-			else {
-				that._sendMessageAfterDelay(toId, response.message);
-			}
+
+		Cleverbot.prepare(function() {
+			that.cleverbot.write(message, function(response) {
+				that.winston.info("Cleverbot responded with params:");
+				that.winston.info(that.cleverbot.params);
+				if (response.message != '<html>' && response.message.trim() != '' && response.message.indexOf("Error:") != 0) {
+					that._sendMessageAfterDelay(toId, response.message.trim());
+				}
+			});
 		});
 
 		return true;
diff --git a/package.json b/package.json
@@ -114,8 +114,11 @@
   },
   "optionalDependencies": {
     "accounting": "^0.4.1",
-    "cleverbot-node": "0.1.x",
+    "body-parser": "^1.13.2",
+    "cleverbot-node": "0.2.x",
     "dotenv": "^1.1.0",
+    "express-session": "^1.11.3",
+    "filendir": "0.0.1",
     "firebase": "^2.2.6",
     "fireproof": "^2.5.2",
     "github-webhook-handler": "^0.4.0",
diff --git a/spec/wolframAlphaTriggerSpec.js b/spec/wolframAlphaTriggerSpec.js
