Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Fix bot_channel_join and bot_group_join with Slack Events API #514

Merged
merged 4 commits into from
Dec 19, 2016
Merged

Fix bot_channel_join and bot_group_join with Slack Events API #514

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d98a74
fix bot_channel_join and bot_group_join event with events api
jonchurch Nov 26, 2016
cc76fb9
undo changes to example bot
jonchurch Nov 26, 2016
95718d4
add group_join exception to bot generated events
jonchurch Nov 26, 2016
8d95781
typo fix
jonchurch Nov 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/SlackBot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ function Slackbot(configuration) {
id: team.bot.user_id,
name: team.bot.name
};
if (team.bot.user_id === req.body.event.user && req.body.event.subtype !== 'channel_join' && req.body.event.subtype !== 'group_join') {

Copy link

@bertiful bertiful Dec 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove blank line.

if (team.bot.user_id === req.body.event.user) {
slack_botkit.debug('Got event from this bot user, ignoring it');
return;
}
Expand Down Expand Up @@ -682,7 +682,7 @@ function Slackbot(configuration) {
// set up a couple of special cases based on subtype
if (message.subtype && message.subtype == 'channel_join') {
// someone joined. maybe do something?
if (message.user == bot.identity.id && message.bot_id) {
if (message.user == bot.identity.id) {
slack_botkit.trigger('bot_channel_join', [bot, message]);
return false;
} else {
Expand All @@ -691,7 +691,7 @@ function Slackbot(configuration) {
}
} else if (message.subtype && message.subtype == 'group_join') {
// someone joined. maybe do something?
if (message.user == bot.identity.id && message.bot_id) {
if (message.user == bot.identity.id) {
slack_botkit.trigger('bot_group_join', [bot, message]);
return false;
} else {
Expand Down