From 4b1b924806fad0bf33b5f71819cf4cdde79625fa Mon Sep 17 00:00:00 2001 From: Ismaw34 Date: Fri, 28 Sep 2018 21:50:30 +0200 Subject: [PATCH 1/2] Fixed SlackBridge Private Channels --- packages/rocketchat-slackbridge/server/RocketAdapter.js | 2 +- packages/rocketchat-slackbridge/server/SlackAdapter.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-slackbridge/server/RocketAdapter.js b/packages/rocketchat-slackbridge/server/RocketAdapter.js index 51f506e583760..fab232928c955 100644 --- a/packages/rocketchat-slackbridge/server/RocketAdapter.js +++ b/packages/rocketchat-slackbridge/server/RocketAdapter.js @@ -233,7 +233,7 @@ export default class RocketAdapter { let slackResults = null; let isGroup = false; if (slackChannelID.charAt(0) === 'C') { - slackResults = HTTP.get('https://slack.com/api/channels.info', { params: { token: this.slackBridge.apiToken, channel: slackChannelID } }); + slackResults = HTTP.get('https://slack.com/api/conversations.info', { params: { token: this.slackBridge.apiToken, channel: slackChannelID } }); } else if (slackChannelID.charAt(0) === 'G') { slackResults = HTTP.get('https://slack.com/api/groups.info', { params: { token: this.slackBridge.apiToken, channel: slackChannelID } }); isGroup = true; diff --git a/packages/rocketchat-slackbridge/server/SlackAdapter.js b/packages/rocketchat-slackbridge/server/SlackAdapter.js index 60c6500328142..04a9ff22746cc 100644 --- a/packages/rocketchat-slackbridge/server/SlackAdapter.js +++ b/packages/rocketchat-slackbridge/server/SlackAdapter.js @@ -436,7 +436,7 @@ export default class SlackAdapter { postGetChannelInfo(slackChID) { logger.slack.debug('Getting slack channel info', slackChID); - const response = HTTP.get('https://slack.com/api/channels.info', { params: { token: this.apiToken, channel: slackChID } }); + const response = HTTP.get('https://slack.com/api/conversations.info', { params: { token: this.apiToken, channel: slackChID } }); if (response && response.data) { return response.data.channel; } @@ -444,7 +444,7 @@ export default class SlackAdapter { postFindChannel(rocketChannelName) { logger.slack.debug('Searching for Slack channel or group', rocketChannelName); - let response = HTTP.get('https://slack.com/api/channels.list', { params: { token: this.apiToken } }); + let response = HTTP.get('https://slack.com/api/conversations.list', { params: { token: this.apiToken , types: 'public_channel,private_channel' } }); if (response && response.data && _.isArray(response.data.channels) && response.data.channels.length > 0) { for (const channel of response.data.channels) { if (channel.name === rocketChannelName && channel.is_member === true) { @@ -517,7 +517,7 @@ export default class SlackAdapter { } populateMembershipChannelMapByChannels() { - const response = HTTP.get('https://slack.com/api/channels.list', { params: { token: this.apiToken } }); + const response = HTTP.get('https://slack.com/api/conversations.list', { params: { token: this.apiToken, types: 'public_channel,private_channel' } }); if (response && response.data && _.isArray(response.data.channels) && response.data.channels.length > 0) { for (const slackChannel of response.data.channels) { const rocketchat_room = RocketChat.models.Rooms.findOneByName(slackChannel.name, { fields: { _id: 1 } }); From 021de08faf721b516f7537fce96c55d8bf53f32a Mon Sep 17 00:00:00 2001 From: Ismaw34 Date: Sat, 29 Sep 2018 10:39:26 +0200 Subject: [PATCH 2/2] Fixed space on SlackAdapter --- packages/rocketchat-slackbridge/server/SlackAdapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-slackbridge/server/SlackAdapter.js b/packages/rocketchat-slackbridge/server/SlackAdapter.js index 04a9ff22746cc..dfeb186521157 100644 --- a/packages/rocketchat-slackbridge/server/SlackAdapter.js +++ b/packages/rocketchat-slackbridge/server/SlackAdapter.js @@ -444,7 +444,7 @@ export default class SlackAdapter { postFindChannel(rocketChannelName) { logger.slack.debug('Searching for Slack channel or group', rocketChannelName); - let response = HTTP.get('https://slack.com/api/conversations.list', { params: { token: this.apiToken , types: 'public_channel,private_channel' } }); + let response = HTTP.get('https://slack.com/api/conversations.list', { params: { token: this.apiToken, types: 'public_channel,private_channel' } }); if (response && response.data && _.isArray(response.data.channels) && response.data.channels.length > 0) { for (const channel of response.data.channels) { if (channel.name === rocketChannelName && channel.is_member === true) {