Merge pull request #699 from mbensch/master

Fixes slash commands when using internal webserver
howdyai · Mar 9, 2017 · 3754bf6 · 3754bf6
2 parents 94bbe03 + 101457a
commit 3754bf6
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/lib/SlackBot.js b/lib/SlackBot.js
@@ -205,10 +205,22 @@ function Slackbot(configuration) {
 
                 // Identify the bot from either team storage or identifyBot()
                 bot.team_info = team;
-                bot.identity = {
-                    id: team.bot.user_id,
-                    name: team.bot.name
-                };
+
+                // The bot identity is only used in handleEventsAPI during this flow
+                // Recent changes in Slack will break other integrations as they no longer
+                // require a bot and therefore Slack won't send the bot information.
+                if ( payload.type === 'event_callback' ) {
+
+                    if( !team.bot ) {
+                        slack_botkit.log.error('No bot identity found.');
+                        return;
+                    }
+
+                    bot.identity = {
+                        id: team.bot.user_id,
+                        name: team.bot.name
+                    };
+                }
             }
 
             bot.res = res;