Skip to content

[FIX] Fixed SlackBridge Private Channels #12213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ismaw34 wants to merge 6 commits into from
Closed

[FIX] Fixed SlackBridge Private Channels #12213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b1b924
Fixed SlackBridge Private Channels
Sep 28, 2018
021de08
Fixed space on SlackAdapter
Sep 29, 2018
bb9e625
Merge branch 'develop' into develop
Ismaw34 Oct 2, 2018
534d6aa
Merge branch 'develop' into develop
Hudell Nov 19, 2018
2b25ee4
Merge branch 'develop' into develop
Mar 20, 2019
71bee4f
Merge branch 'develop' into develop
engelgabriel Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/slackbridge/server/RocketAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,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;
Expand Down
6 changes: 3 additions & 3 deletions app/slackbridge/server/SlackAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,15 @@ 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;
}
}

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) {
Expand Down Expand Up @@ -532,7 +532,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 = Rooms.findOneByName(slackChannel.name, { fields: { _id: 1 } });
Expand Down