Skip to content

Commit 847b7bd

Browse files
committed
Merge branch 'release/0.2.0'
2 parents debf6ce + 2a12bf4 commit 847b7bd

46 files changed

Lines changed: 1602 additions & 1006 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"extends": "airbnb",
33
"env": {
4-
"node":true,
5-
"mocha":true,
4+
"node": true,
5+
"mocha": true,
66
"es6": true,
7-
"mongo":true
7+
"mongo": true
88
},
99
"rules": {
1010
// disable requiring trailing commas

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.git
2+
.editorconfig
3+

conf/conf.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@
33
"persistentMenu": [
44
{"type": "postback", "title": "Help", "payload": "Help"}
55
],
6-
"welcomeText": "Change this welcome text in conf/conf.json file"
6+
"welcomeText": "Change this welcome text in conf/conf.json file",
7+
"env": {
8+
"FB_PAGE_ACCESS_TOKEN": [
9+
{ "PAGE_ID": "12", "FB_PAGE_ACCESS_TOKEN": "567", "is_default": "true" },
10+
{ "PAGE_ID": "15", "FB_PAGE_ACCESS_TOKEN": "890" }
11+
]
12+
}
713
}

index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
2-
31
require('dotenv').config();
42
module.exports = require('./src/botstack.js');

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "botstack",
3-
"version": "0.1.5",
3+
"version": "0.2.0",
44
"description": "Bot Stack",
55
"main": "index.js",
66
"scripts": {
@@ -22,6 +22,7 @@
2222
"dotenv": "^4.0.0",
2323
"lodash": "^4.17.4",
2424
"mongoose": "^4.8.1",
25+
"nock": "^9.1.5",
2526
"node-botmetrics": "0.0.1",
2627
"node-emoji": "^1.3.1",
2728
"oauth2-server": "^2.4.1",
@@ -31,8 +32,8 @@
3132
"request": "^2.79.0",
3233
"request-promise": "^4.1.1",
3334
"restify": "^4.1.1",
34-
"rewire": "^2.5.2",
35-
"rewiremock": "^1.3.3",
35+
"rewire": "^3.0.2",
36+
"rewiremock": "^3.4.2",
3637
"sinon": "^2.3.8",
3738
"smooch-core": "^4.3.0",
3839
"url-regex": "^4.1.1",

src/api-ai-webhook.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/api-ai.js

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)