jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-24 19:52:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix joining slack/mattermost channels using the webhook

Browse Source
This commit is contained in:
Wim 2016-09-20 12:20:44 +02:00
parent d02a737e0c
commit dce600ad51
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge/mattermost/mattermost.go
View File

@ -84,8 +84,12 @@ func (b *Bmattermost) FullOrigin() string {
} }
func (b *Bmattermost) JoinChannel(channel string) error { func (b *Bmattermost) JoinChannel(channel string) error {
// we can only join channels using the API
if b.Config.UseAPI {
return b.mc.JoinChannel(channel) return b.mc.JoinChannel(channel)
} }
return nil
}
func (b *Bmattermost) Name() string { func (b *Bmattermost) Name() string {
return b.protocol + "." + b.origin return b.protocol + "." + b.origin

6
bridge/slack/slack.go
View File

@ -68,9 +68,13 @@ func (b *Bslack) FullOrigin() string {
} }
func (b *Bslack) JoinChannel(channel string) error { func (b *Bslack) JoinChannel(channel string) error {
// we can only join channels using the API
if b.Config.UseAPI {
schannel := b.getChannelByName(channel) schannel := b.getChannelByName(channel)
if schannel != nil && !schannel.IsMember { if schannel != nil && !schannel.IsMember {
b.sc.JoinChannel(schannel.ID) _, err := b.sc.JoinChannel(schannel.ID)
return err
}
} }
return nil return nil
} }