From 7b49fda50060b5efc34bd7582e4e59d810521c95 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 13:10:25 +0200 Subject: [PATCH 01/21] Add who made you --- bot.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bot.js b/bot.js index 227944a9f..c78091841 100755 --- a/bot.js +++ b/bot.js @@ -26,7 +26,7 @@ This bot demonstrates many of the core features of Botkit: Run your bot from the command line: set token= - + node bot.js # USE THE BOT: @@ -132,6 +132,17 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m }); }); +controller.hears(['who make you','who made you'],'direct_message,direct_mention,mention',function(bot, message) { + + controller.storage.users.get(message.user,function(err, user) { + if (user && user.name) { + bot.reply(message,'Metro group made me'); + } else { + bot.reply(message,'who know'); + } + }); +}); + controller.hears(['shutdown'],'direct_message,direct_mention,mention',function(bot, message) { From 78edf1709cf65d3d02e71ecd7955568d17ed4cad Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 14:41:28 +0200 Subject: [PATCH 02/21] Fix who made me --- bot.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bot.js b/bot.js index c78091841..8c197cd5b 100755 --- a/bot.js +++ b/bot.js @@ -135,11 +135,7 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m controller.hears(['who make you','who made you'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { - if (user && user.name) { - bot.reply(message,'Metro group made me'); - } else { - bot.reply(message,'who know'); - } + bot.reply(message,'Metro group made me'); }); }); From 9330e13b9297bc8b357a26a6de2557a22d13fe44 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 14:46:08 +0200 Subject: [PATCH 03/21] Add who made you 3 --- bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.js b/bot.js index 8c197cd5b..5e54000cd 100755 --- a/bot.js +++ b/bot.js @@ -135,7 +135,7 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m controller.hears(['who make you','who made you'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { - bot.reply(message,'Metro group made me'); + bot.reply(message,'Metro group made me. Hihi'); }); }); From 207dd3bc2e976ab0bdc2fa52ff4123ad701515d8 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 14:52:08 +0200 Subject: [PATCH 04/21] Add ten prime numbers --- bot.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bot.js b/bot.js index 5e54000cd..0c8e413f3 100755 --- a/bot.js +++ b/bot.js @@ -132,6 +132,13 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m }); }); +controller.hears(['prime','first ten prime numbers'],'direct_message,direct_mention,mention',function(bot, message) { + + controller.storage.users.get(message.user,function(err, user) { + bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23'); + }); +}); + controller.hears(['who make you','who made you'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { From 196f8548c8e68f5f07de71643be56c48799f7aea Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 15:06:20 +0200 Subject: [PATCH 05/21] Add check prime number --- bot.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/bot.js b/bot.js index 0c8e413f3..b36ea43a6 100755 --- a/bot.js +++ b/bot.js @@ -139,6 +139,28 @@ controller.hears(['prime','first ten prime numbers'],'direct_message,direct_ment }); }); +controller.hears(['prime (.*)'],'direct_message,direct_mention,mention',function(bot, message) { + var matches = message.text.match(/prime (.*)/i); + var nume = matches[1]; + controller.storage.users.get(message.user,function(err, user) { + controller.storage.users.save(user,function(err, id) { + if(isPrime(nume)){ + bot.reply(message,nume + 'is prime number'); + }else{ + bot.reply(message,nume + 'is not prime number'); + } + }); + }); +}); + +function isPrime(number) { + var start = 2; + while (start <= Math.sqrt(number)) { + if (number % start++ < 1) return false; + } + return number > 1; +} + controller.hears(['who make you','who made you'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { From 7281662ef905da304920c2365a63712b50781d81 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 15:13:19 +0200 Subject: [PATCH 06/21] Fix prime x --- bot.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bot.js b/bot.js index b36ea43a6..b91db0742 100755 --- a/bot.js +++ b/bot.js @@ -135,21 +135,20 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m controller.hears(['prime','first ten prime numbers'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { - bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23'); + bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23, 29'); }); }); controller.hears(['prime (.*)'],'direct_message,direct_mention,mention',function(bot, message) { var matches = message.text.match(/prime (.*)/i); var nume = matches[1]; + bot.reply(message,nume + 'is prime number'); controller.storage.users.get(message.user,function(err, user) { - controller.storage.users.save(user,function(err, id) { if(isPrime(nume)){ bot.reply(message,nume + 'is prime number'); }else{ bot.reply(message,nume + 'is not prime number'); - } - }); + }); }); }); From 6e9cd7c87cbb5c30f08feb453fb98585c96d0ead Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 15:18:18 +0200 Subject: [PATCH 07/21] Finish prime numbers --- bot.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bot.js b/bot.js index b91db0742..5c49916ba 100755 --- a/bot.js +++ b/bot.js @@ -132,7 +132,7 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m }); }); -controller.hears(['prime','first ten prime numbers'],'direct_message,direct_mention,mention',function(bot, message) { +controller.hears(['ten prime','first ten prime numbers'],'direct_message,direct_mention,mention',function(bot, message) { controller.storage.users.get(message.user,function(err, user) { bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23, 29'); @@ -142,13 +142,12 @@ controller.hears(['prime','first ten prime numbers'],'direct_message,direct_ment controller.hears(['prime (.*)'],'direct_message,direct_mention,mention',function(bot, message) { var matches = message.text.match(/prime (.*)/i); var nume = matches[1]; - bot.reply(message,nume + 'is prime number'); controller.storage.users.get(message.user,function(err, user) { if(isPrime(nume)){ - bot.reply(message,nume + 'is prime number'); + bot.reply(message,nume + ' is prime number'); }else{ - bot.reply(message,nume + 'is not prime number'); - }); + bot.reply(message,nume + ' is not prime number'); + } }); }); From 188b96338d74dcc219b88731fd7c7d501137ba57 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 15:21:45 +0200 Subject: [PATCH 08/21] Finnish prime 2 --- bot.js | 1 + 1 file changed, 1 insertion(+) diff --git a/bot.js b/bot.js index 5c49916ba..299420007 100755 --- a/bot.js +++ b/bot.js @@ -147,6 +147,7 @@ controller.hears(['prime (.*)'],'direct_message,direct_mention,mention',function bot.reply(message,nume + ' is prime number'); }else{ bot.reply(message,nume + ' is not prime number'); + bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23, 29'); } }); }); From b25bdab81ef474c74872738877a27c448c849e31 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Mon, 22 Feb 2016 15:35:39 +0200 Subject: [PATCH 09/21] Add .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..3c3629e64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules From 1d48a73adf5099307f1f9a4132d6e457f0334706 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Tue, 23 Feb 2016 11:55:19 +0200 Subject: [PATCH 10/21] Fix fibonacci and prime --- bot.js | 61 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/bot.js b/bot.js index b70042fa8..e550c8418 100755 --- a/bot.js +++ b/bot.js @@ -133,26 +133,6 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m }); }); -controller.hears(['ten prime','first ten prime numbers'],'direct_message,direct_mention,mention',function(bot, message) { - - controller.storage.users.get(message.user,function(err, user) { - bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23, 29'); - }); -}); - -controller.hears(['prime (.*)'],'direct_message,direct_mention,mention',function(bot, message) { - var matches = message.text.match(/prime (.*)/i); - var nume = matches[1]; - controller.storage.users.get(message.user,function(err, user) { - if(isPrime(nume)){ - bot.reply(message,nume + ' is prime number'); - }else{ - bot.reply(message,nume + ' is not prime number'); - bot.reply(message,'1 ,2 ,3, 5, 7, 11, 13, 17, 19, 23, 29'); - } - }); -}); - function isPrime(number) { var start = 2; while (start <= Math.sqrt(number)) { @@ -206,30 +186,31 @@ controller.hears(['uptime','identify yourself','who are you','what is your name' controller.hears(['fibonacci'], 'direct_message,direct_mention,mention', function(bot, message) { if (message.text === 'fibonacci') { - bot.reply(message, '1, 1, 2, 3, 5, 8, 13, 21, 34, 55'); + bot.reply(message, '1, 1, 2, 3, 5'); } }); controller.hears(['fibonacci ([0-9]+)'], 'direct_message,direct_mention,mention', function(bot, message) { var parameter = parseInt(message.match[1]); - + var fibonacci = calculateFibonacciUpto(parameter); - if (fibonacci[fibonacci.length-1] !== parameter) { bot.reply(message, 'That is not a Fibonacci number!'); } else { - bot.reply(message, fibonacci.slice(fibonacci.length-10,fibonacci.length).join(', ')); + for (var i = 0; i < 5; i++){ + fibonacci.push(fibonacci[fibonacci.length-2] + fibonacci[fibonacci.length-1]) + } + bot.reply(message, fibonacci.slice(fibonacci.length - 5,fibonacci.length).join(', ')); } }); function calculateFibonacciUpto(goal) { var fibonacci = [1, 1]; - while (fibonacci[fibonacci.length-1] < goal) { fibonacci.push(fibonacci[fibonacci.length-2] + fibonacci[fibonacci.length-1]); } - + return fibonacci; } @@ -262,16 +243,17 @@ controller.hears('prime (.*)',['direct_message', 'direct_mention', 'mention'],fu var parameter = parseInt(message.match[1]); if (MathHelper.isPrime(parameter)) { + bot.reply(message, "your parameter: " + parameter + " is a Prime number"); var primes = new Array(); - var number = parameter + 1; + var number = parameter - 1; - while (primes.length < 10) { + while (primes.length < 10 && number >=0) { if (MathHelper.isPrime(number)) { primes.push(number); } - number++; + number--; } var reply = ""; @@ -282,7 +264,24 @@ controller.hears('prime (.*)',['direct_message', 'direct_mention', 'mention'],fu return bot.reply(message, reply); } else { - return bot.reply(message, "your parameter: " + parameter + " is not Prime number"); + bot.reply(message, "your parameter: " + parameter + " is not Prime number"); + var primes = new Array(); + var number = parameter - 1; + + while (primes.length < 10 && number >=0) { + + if (MathHelper.isPrime(number)) { + primes.push(number); + } + + number--; + } + + var reply = ""; + for (var i = 0; i < primes.length; i++) { + reply += primes[i] + " "; + } + + return bot.reply(message, reply); } }); - From 95e4d31b5465e829507c428b1e4e43c749556ba8 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Wed, 24 Feb 2016 14:01:55 +0200 Subject: [PATCH 11/21] Add Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..44899d931 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +worker: node bot.js From 937ff4e60dc8172dc67279807d641cfe4a7a9010 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Wed, 24 Feb 2016 14:07:59 +0200 Subject: [PATCH 12/21] Add travis.yml --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..f3f9dca48 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: node_js +node_js: + - "4.1" + - "4.0" + - "0.12" + - "0.11" + - "0.10" + - "0.8" + - "0.6" + - "iojs" + From cef3a72a4ba2fed81d94491d18e078242387fdae Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Wed, 24 Feb 2016 14:12:25 +0200 Subject: [PATCH 13/21] Fix .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3f9dca48..38072dcae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,5 @@ node_js: - "0.12" - "0.11" - "0.10" - - "0.8" - - "0.6" - "iojs" From 378791282cf6618cce3b5a4f0667aff8febf435c Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Wed, 24 Feb 2016 15:37:39 +0200 Subject: [PATCH 14/21] Add speedrun game --- bot.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bot.js b/bot.js index e550c8418..1dc707e0c 100755 --- a/bot.js +++ b/bot.js @@ -285,3 +285,15 @@ controller.hears('prime (.*)',['direct_message', 'direct_mention', 'mention'],fu return bot.reply(message, reply); } }); + +controller.hears('give (.*)',['direct_message', 'direct_mention', 'mention'],function(bot,message) { + var gameName = message.match[1]; + var request = require('request'); + request('http://www.speedrun.com/api_records.php?series=' + gameName, function (error, response, body) { + if (!error && response.statusCode == 200) { + var parse = JSON.parse(body); + console.log(parse); + bot.reply(message, parse[Object.keys(parse)[0]][Object.keys(parse[Object.keys(parse)[0]])[0]]['time']); + } + }) +}); From c67af04c8a7e183b8d8c7a79fff6cfcc2e4d2420 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 10:41:51 +0200 Subject: [PATCH 15/21] Update --- ISSUE_TEMPLATE.md | 5 +++++ bot.js | 22 ++++++++++++++++++++++ node-inspector | 1 + weather | 1 + 4 files changed, 29 insertions(+) create mode 100644 ISSUE_TEMPLATE.md create mode 160000 node-inspector create mode 160000 weather diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..84c8153a8 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,5 @@ +- [ ] a task list item +- [ ] list syntax required +- [ ] normal **formatting**, @mentions, #1234 refs +- [ ] incomplete +- [x] completed diff --git a/bot.js b/bot.js index 1dc707e0c..d62be3d5f 100755 --- a/bot.js +++ b/bot.js @@ -106,6 +106,28 @@ controller.hears(['hello','hi'],'direct_message,direct_mention,mention',function }); }); +controller.hears(['hei','moi'],'direct_message,direct_mention,mention',function(bot, message) { + + bot.api.reactions.add({ + timestamp: message.ts, + channel: message.channel, + name: 'robot_face', + },function(err, res) { + if (err) { + bot.botkit.log('Failed to add emoji reaction :(',err); + } + }); + + + controller.storage.users.get(message.user,function(err, user) { + if (user && user.name) { + bot.reply(message,'Hei ' + user.name + '.' + 'Hauska tavata!!'); + } else { + bot.reply(message,'Hei. Hauska tutustua!'); + } + }); +}); + controller.hears(['call me (.*)'],'direct_message,direct_mention,mention',function(bot, message) { var matches = message.text.match(/call me (.*)/i); var name = matches[1]; diff --git a/node-inspector b/node-inspector new file mode 160000 index 000000000..bd7337056 --- /dev/null +++ b/node-inspector @@ -0,0 +1 @@ +Subproject commit bd733705673b158e3dcb022f67f7cf386e7fa61e diff --git a/weather b/weather new file mode 160000 index 000000000..cc33373de --- /dev/null +++ b/weather @@ -0,0 +1 @@ +Subproject commit cc33373de4fc850b050efe844c6e5d6089aa44c0 From a13529ed6273aa12a626181346268b44f71bf7bd Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 10:46:19 +0200 Subject: [PATCH 16/21] Create ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..3cd0513b8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,3 @@ +- [x] Finish my changes +- [ ] Push my commits to GitHub +- [ ] Open a pull request From 3bba0d213f5da8156380eb16355f5e5bb91fd537 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 10:47:33 +0200 Subject: [PATCH 17/21] Create PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..3fb729deb --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1 @@ +@github/support What do you think about these updates? From 014b5eebd609c77d296f74b8fd76a25f62d91b56 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 13:02:27 +0200 Subject: [PATCH 18/21] Beta google sama --- bot.js | 22 ++++++++++++++++++++++ package.json | 3 ++- tests/botmathTest.js | 17 +++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 tests/botmathTest.js diff --git a/bot.js b/bot.js index d62be3d5f..2490b8b88 100755 --- a/bot.js +++ b/bot.js @@ -319,3 +319,25 @@ controller.hears('give (.*)',['direct_message', 'direct_mention', 'mention'],fun } }) }); + +controller.hears(['google this (.*)','google-haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { + var keyWord = message.match[1]; + var google = require('google'); + + google.resultsPerPage = 4; + var nextCounter = 0; + + google(keyWord, function (err, next, links){ + if (err) console.error(err) + + for (var i = 0; i < links.length; ++i) { + bot.reply(message, links[i].title + ' - ' + links[i].link); + //bot.reply(message, links[i].description + "\n"); + } + + if (nextCounter < 2) { + nextCounter += 1 + if (next) next() + } + }) +}); diff --git a/package.json b/package.json index 69a5959a8..a3ff40c2c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "jfs": "^0.2.6", "mustache": "^2.2.1", "request": "^2.67.0", - "ws": "^1.0.0" + "ws": "^1.0.0", + "google": "~1.5.0" }, "devDependencies": { "jscs": "^2.7.0", diff --git a/tests/botmathTest.js b/tests/botmathTest.js new file mode 100644 index 000000000..6efe52606 --- /dev/null +++ b/tests/botmathTest.js @@ -0,0 +1,17 @@ +var assert = require('assert'); +var bothmath = require('../botmath.js'); + +describe('botmath', function() { + describe('sum', function () { + it('should return sum of 2 values', function () { + assert.equal(-10, bothmath.sum(1, 2)); + assert.equal(-2, bothmath.sum(-2, 0)); + assert.equal(1, bothmath.sum(-1, 2)); + assert.equal(6.5, bothmath.sum(3.5, 3)); + assert.equal(1337, bothmath.sum(1338.2, -1.2)); + }) + it('should return NaN if both values are not numeric', function () { + assert.ok(isNaN(bothmath.sum(1335, 'a'))); + }); + }); +}); From dae2aa3b1f2a796ab46246e7ecfee259a9fc7252 Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 13:15:57 +0200 Subject: [PATCH 19/21] trial 2nd time --- bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.js b/bot.js index 2490b8b88..8af58a997 100755 --- a/bot.js +++ b/bot.js @@ -320,7 +320,7 @@ controller.hears('give (.*)',['direct_message', 'direct_mention', 'mention'],fun }) }); -controller.hears(['google this (.*)','google-haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { +controller.hears(['google this (.*)','google haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { var keyWord = message.match[1]; var google = require('google'); From 5a4dd69656c3ad87056c41a406cb40fcee70418e Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 13:32:07 +0200 Subject: [PATCH 20/21] final version --- bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.js b/bot.js index 8af58a997..a61b5f19e 100755 --- a/bot.js +++ b/bot.js @@ -320,7 +320,7 @@ controller.hears('give (.*)',['direct_message', 'direct_mention', 'mention'],fun }) }); -controller.hears(['google this (.*)','google haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { +controller.hears(['google (.*)','google haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { var keyWord = message.match[1]; var google = require('google'); From 9dc34c09a4abbbb6f1a610a317f74ca377f6a3cb Mon Sep 17 00:00:00 2001 From: ChanhLeNguyen Date: Fri, 26 Feb 2016 13:34:46 +0200 Subject: [PATCH 21/21] rid of this --- bot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot.js b/bot.js index a61b5f19e..aa58083e0 100755 --- a/bot.js +++ b/bot.js @@ -320,7 +320,7 @@ controller.hears('give (.*)',['direct_message', 'direct_mention', 'mention'],fun }) }); -controller.hears(['google (.*)','google haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { +controller.hears(['google (.*)','google this(.*)','google haku (.*)'],['direct_message', 'direct_mention', 'mention'],function(bot,message) { var keyWord = message.match[1]; var google = require('google');