From 45642f71fa751031dcb4b421d92c72d87ea0a590 Mon Sep 17 00:00:00 2001 From: Brycen Dorsay Date: Fri, 30 Sep 2016 16:13:16 -0700 Subject: [PATCH 1/2] Return when topic invalid --- processing.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/processing.js b/processing.js index 91645fb..ab80940 100644 --- a/processing.js +++ b/processing.js @@ -55,12 +55,11 @@ exports.processUpdate = function(update, classifier, cb) { let message = this.conform(update); message.topic = classifier.classify(message.text); // Save ALL messages - messagesController.createMessage(message, (m) => log.debug(`Message saved: ${m._id}`)); - - log.debug(`User: ${message.user.first_name} Message: ${message.text}`); - + messagesController.createMessage(message, (m) => log.info(`Message saved: ${m.text}`)); // Actions if(message.action != undefined) { + console.log('!!!!!!!!!!!!!!action') + if(message.action == 'edit') message.response = strings.$('edit', message.user.first_name); else if(message.action == 'confirm') @@ -69,11 +68,13 @@ exports.processUpdate = function(update, classifier, cb) { message.response = 'Nnnnooooooooooo'; else message.response = 'I think I\'m supposed to do something here but I\'m not really sure what'; - cb(message); + cb(message); } - + // Topics else if(message.topic != undefined && message.topic != 'else') { + console.log('!!!!!!!!!!!!!!topic') + if(message.topic == 'update') { /** Deprecated **/ // message = actions.update(message); @@ -84,11 +85,15 @@ exports.processUpdate = function(update, classifier, cb) { // cb(data); // }); cb(message); + } else { + cb(message); } } // Message content else { + console.log('!!!!!!!!!!!!!!content') + if(message.text.match(/(define)/i)) { const word = message.text.split(/(define)/i)[2]; actions.define(message, word, (result) => cb(result)); From 51d8625fcabefa7beda8aed706db8bff4290f623 Mon Sep 17 00:00:00 2001 From: Brycen Dorsay Date: Fri, 30 Sep 2016 16:16:19 -0700 Subject: [PATCH 2/2] Remove debug logging lines --- processing.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/processing.js b/processing.js index ab80940..a53d88a 100644 --- a/processing.js +++ b/processing.js @@ -58,8 +58,6 @@ exports.processUpdate = function(update, classifier, cb) { messagesController.createMessage(message, (m) => log.info(`Message saved: ${m.text}`)); // Actions if(message.action != undefined) { - console.log('!!!!!!!!!!!!!!action') - if(message.action == 'edit') message.response = strings.$('edit', message.user.first_name); else if(message.action == 'confirm') @@ -73,8 +71,6 @@ exports.processUpdate = function(update, classifier, cb) { // Topics else if(message.topic != undefined && message.topic != 'else') { - console.log('!!!!!!!!!!!!!!topic') - if(message.topic == 'update') { /** Deprecated **/ // message = actions.update(message); @@ -92,8 +88,6 @@ exports.processUpdate = function(update, classifier, cb) { // Message content else { - console.log('!!!!!!!!!!!!!!content') - if(message.text.match(/(define)/i)) { const word = message.text.split(/(define)/i)[2]; actions.define(message, word, (result) => cb(result));