From f4de7ac63f77a0c59fbc4e879c0147ea95b233f4 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Mon, 23 Jan 2017 11:14:49 -0200 Subject: [PATCH] Fix Slack Importer incorrectly logging missed types and add slackbot_response to the import --- packages/rocketchat-importer-slack/server.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-importer-slack/server.coffee b/packages/rocketchat-importer-slack/server.coffee index ccd1975175c..04ca574ac1a 100644 --- a/packages/rocketchat-importer-slack/server.coffee +++ b/packages/rocketchat-importer-slack/server.coffee @@ -229,7 +229,7 @@ Importer.Slack = class Importer.Slack extends Importer.Base msg: "_#{@convertSlackMessageToRocketChat(message.text)}_" _.extend msgObj, msgDataDefaults RocketChat.sendMessage @getRocketUser(message.user), msgObj, room, true - else if message.subtype is 'bot_message' + else if message.subtype is 'bot_message' or message.subtype is 'slackbot_response' botUser = RocketChat.models.Users.findOneById 'rocket.cat', { fields: { username: 1 }} botUsername = if @bots[message.bot_id] then @bots[message.bot_id]?.name else message.username msgObj = @@ -320,7 +320,10 @@ Importer.Slack = class Importer.Slack extends Importer.Base Meteor.call 'setReaction', ":#{reaction.name}:", msgDataDefaults._id @addCountCompleted 1 - console.log 'Missed import types:', missedTypes + + if not _.isEmpty missedTypes + console.log 'Missed import types:', missedTypes + @updateProgress Importer.ProgressStep.FINISHING for channel in @channels.channels when channel.do_import and channel.is_archived do (channel) =>