Merge pull request #514 from jonchurch/issue347fix

Fix bot_channel_join and bot_group_join with Slack Events API
howdyai · Dec 19, 2016 · aa5e2cb · aa5e2cb
2 parents ed93974 + 8d95781
commit aa5e2cb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/SlackBot.js b/lib/SlackBot.js
@@ -225,8 +225,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') {
 
-                if (team.bot.user_id === req.body.event.user) {
                     slack_botkit.debug('Got event from this bot user, ignoring it');
                     return;
                 }
@@ -696,7 +696,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 {
@@ -705,7 +705,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 {