From dce600ad51100d9f9a1cee1d0bda9410f0a2c2a9 Mon Sep 17 00:00:00 2001 From: Wim Date: Tue, 20 Sep 2016 12:20:44 +0200 Subject: Fix joining slack/mattermost channels using the webhook --- bridge/slack/slack.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'bridge/slack') diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 75429852..79b291b2 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -68,9 +68,13 @@ func (b *Bslack) FullOrigin() string { } func (b *Bslack) JoinChannel(channel string) error { - schannel := b.getChannelByName(channel) - if schannel != nil && !schannel.IsMember { - b.sc.JoinChannel(schannel.ID) + // we can only join channels using the API + if b.Config.UseAPI { + schannel := b.getChannelByName(channel) + if schannel != nil && !schannel.IsMember { + _, err := b.sc.JoinChannel(schannel.ID) + return err + } } return nil } -- cgit v1.2.3