commit 5f0c21ae3f14494ccb2c7dab7d36073025dc4521
Author: Wim <wim@42.be>
Date: Tue Sep 20 12:20:44 2016 +0000
Fix joining slack/mattermost channels using the webhook
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 0e62766..a79a311 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -847 +8411 @@ func (b *Bmattermost) FullOrigin() string {
}
func (b *Bmattermost) JoinChannel(channel string) error {
- return b.mc.JoinChannel(channel)
+ // we can only join channels using the API
+ if b.Config.UseAPI {
+ return b.mc.JoinChannel(channel)
+ }
+ return nil
}
func (b *Bmattermost) Name() string {
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 7542985..79b291b 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -689 +6813 @@ 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
}
