From e11aacbf3817e7ffc5a4dac8a83234546eae84ca Mon Sep 17 00:00:00 2001 From: Anton Kazarinov Date: Wed, 19 Feb 2020 10:40:22 +0500 Subject: [PATCH] fix(slack-bridge): slackbridge-import command doesn't work Closes #16338 --- .../server/slackbridge_import.server.js | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/app/slackbridge/server/slackbridge_import.server.js b/app/slackbridge/server/slackbridge_import.server.js index 978af4f89f33e..27f4c07331bcb 100644 --- a/app/slackbridge/server/slackbridge_import.server.js +++ b/app/slackbridge/server/slackbridge_import.server.js @@ -29,30 +29,32 @@ function SlackBridgeImport(command, params, item) { }); try { - SlackBridge.slack.importMessages(item.rid, (error) => { - if (error) { - msgStream.emit(item.rid, { - _id: Random.id(), - rid: item.rid, - u: { username: 'rocket.cat' }, - ts: new Date(), - msg: TAPi18n.__('SlackBridge_error', { - postProcess: 'sprintf', - sprintf: [channel, error.message], - }, user.language), - }); - } else { - msgStream.emit(item.rid, { - _id: Random.id(), - rid: item.rid, - u: { username: 'rocket.cat' }, - ts: new Date(), - msg: TAPi18n.__('SlackBridge_finish', { - postProcess: 'sprintf', - sprintf: [channel], - }, user.language), - }); - } + SlackBridge.slackAdapters.forEach((slack) => { + slack.importMessages(item.rid, (error) => { + if (error) { + msgStream.emit(item.rid, { + _id: Random.id(), + rid: item.rid, + u: { username: 'rocket.cat' }, + ts: new Date(), + msg: TAPi18n.__('SlackBridge_error', { + postProcess: 'sprintf', + sprintf: [channel, error.message], + }, user.language), + }); + } else { + msgStream.emit(item.rid, { + _id: Random.id(), + rid: item.rid, + u: { username: 'rocket.cat' }, + ts: new Date(), + msg: TAPi18n.__('SlackBridge_finish', { + postProcess: 'sprintf', + sprintf: [channel], + }, user.language), + }); + } + }); }); } catch (error) { msgStream.emit(item.rid, {