From dccc3bfe82813a4e7f0f6b111c8742c72e1e1800 Mon Sep 17 00:00:00 2001 From: Chris Rouffer Date: Wed, 17 May 2017 19:50:03 -0400 Subject: [PATCH] Fixed a bug in the direct message responses --- package.json | 2 +- src/googlebot.js | 8 +++++++- src/utils.js | 26 +------------------------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 90e8d9e..e53656b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "slack-googlebot", - "version": "1.0.3", + "version": "1.0.4", "description": "A Slack bot that reminds people to google things before asking their co-workers", "keywords": [ "Slack", diff --git a/src/googlebot.js b/src/googlebot.js index 9ee135c..7ac8648 100644 --- a/src/googlebot.js +++ b/src/googlebot.js @@ -48,7 +48,13 @@ const googlebot = (botToken, options = {}) => { !isDirectMessage) { msgOptions.attachments[0].text = 'What do you want?'; } else { - var searchString = event.text.substr(event.text.indexOf(' ') + 1); + var searchString; + if (isDirectMessage) { + searchString = event.text; + } else { + searchString = event.text.substr(event.text.indexOf(' ') + 1); + } + const response = pickRandom(allowedResponses); msgOptions.attachments[0].pretext = response.text; diff --git a/src/utils.js b/src/utils.js index 8c37def..a87d65c 100644 --- a/src/utils.js +++ b/src/utils.js @@ -44,28 +44,4 @@ export const filterResponsesByCategories = (responses, categories) => responses. return false; }); -export const pickRandom = arr => arr[Math.floor(Math.random() * arr.length)]; - -export const googleSearch = (searchString) => { - return new Promise((resolve, reject) => { - var request = require('request'); - - // Example: https://www.google.ca/search?q=what+is+today%27s+date&oq=what+is+today%27s+date - var queryStringFields = { - q: searchString - }; - var requestArgs = { - url: 'https://www.google.com/search', - qs: queryStringFields - }; - - request(requestArgs, - function(err, response, body) { - if (err) { - reject(); - } else { - resolve(body); - } - }); - }); -}; \ No newline at end of file +export const pickRandom = arr => arr[Math.floor(Math.random() * arr.length)]; \ No newline at end of file