Skip to content

Commit

Permalink
Merge branch 'master' into feature/unitTests
Browse files Browse the repository at this point in the history
  • Loading branch information
benbrown authored Dec 20, 2018
2 parents e923720 + 54a8724 commit 37ee568
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@
},
"extends": [
"eslint:recommended"
]
],
"parserOptions": {
"ecmaVersion": 9,
"sourceType": "module"
}
}
34 changes: 34 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

** DO NOT ERASE THESE INSTRUCTIONS WITHOUT READING THEM FIRST **

Please read this entire template before posting any issue to get faster response.

Open an issue on this repository with your topic or question, providing as much detail as possible. The more we know, the better we can help.

Before posting, search the repository to see if there's already an issue opened to avoid duplicates.

### Are you sure this is an issue with the Botkit core module?

For all other questions, requests or help, please feel free to join the discussion slack : https://community.botkit.ai

### What are you trying to achieve or the steps to reproduce?

Describe your issue here, include as much detail as necessary to reproduce the issue or implement a missing functionality.

````
// Wrap code in markdown source tags
````

### What was the result you received?

### What did you expect?

### Screenshots and animated GIFs

### Context:

- Botkit version:
- Messaging Platform:
- Node version:
- Os:
- Any other relevant information:
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: node_js
node_js:
- lts/*
9 changes: 8 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
# Change Log

[View the official Botkit roadmap](https://github.com/howdyai/botkit/projects/7) for upcoming changes and features.
[View the official Botkit roadmap](https://github.com/howdyai/botkit/projects/9) for upcoming changes and features.

[Want to contribute? Read our guide!](https://github.com/howdyai/botkit/blob/master/CONTRIBUTING.md)


# Next Release (in master on Github)

* Slack: [set useQuerystring to true in Slack API](https://github.com/howdyai/botkit/pull/1547)
* Slack: [Change 500 webserver status to 404 when team not found](https://github.com/howdyai/botkit/pull/1548)
* Google Hangouts: [allow to consume auth data from env var instead of file](https://github.com/howdyai/botkit/pull/1543)

# 0.7.0

This release is the first major step towards [deprecating Botkit Studio](https://github.com/howdyai/botkit/issues/1534),
Expand Down
3 changes: 2 additions & 1 deletion lib/GoogleHangoutsBot.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ function GoogleHangoutsBot(configuration) {
google_hangouts_botkit.middleware.spawn.use(function(worker, next) {

let params = {
scopes: 'https://www.googleapis.com/auth/chat.bot'
scopes: 'https://www.googleapis.com/auth/chat.bot',
...configuration.google_auth_params
};

google
Expand Down
4 changes: 2 additions & 2 deletions lib/SlackBot.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function Slackbot(configuration) {
if (!slack_botkit.config.clientId) {
bot = slack_botkit.spawn({});
} else {
return res.status(500).send();
return res.status(404).send();
}
} else {
// spawn a bot
Expand All @@ -303,7 +303,7 @@ function Slackbot(configuration) {

if (!team.bot) {
slack_botkit.log.error('No bot identity found.');
return res.status(500).send();
return res.status(404).send();
}

}
Expand Down
1 change: 1 addition & 0 deletions lib/Slack_web_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ module.exports = function(bot, config) {
bot.debug('** API CALL: ' + url);
var params = {
url: url,
useQuerystring: true,
headers: {
'User-Agent': bot.userAgent(),
}
Expand Down

0 comments on commit 37ee568

Please sign in to comment.