commit 4011848fb0a1779e739898fb121e3088a2d06661
Author: Wim <wim@42.be>
Date: Sat Jul 15 16:49:47 2017 +0000
Refactor connecting logic slack/mattermost. Fixes #216
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index d425834..3a16f6a 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -16 +17 @@
package bmattermost
import (
+ "errors"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/matterclient"
"github.com/42wim/matterbridge/matterhook"
@@ -5333 +5449 @@ func (b *Bmattermost) Command(cmd string) string {
}
func (b *Bmattermost) Connect() error {
- if b.Config.WebhookURL != "" && b.Config.WebhookBindAddress != "" {
- flog.Info("Connecting using webhookurl and webhookbindaddress")
- b.mh = matterhook.New(b.Config.WebhookURL,
- matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
- BindAddress: b.Config.WebhookBindAddress})
- } else if b.Config.WebhookURL != "" {
- flog.Info("Connecting using webhookurl (for posting) and token")
+ if b.Config.WebhookBindAddress != "" {
+ if b.Config.WebhookURL != "" {
+ flog.Info("Connecting using webhookurl (sending) and webhookbindaddress (receiving)")
+ } else if b.Config.Login != "" {
+ flog.Info("Connecting using login/password (sending)")
+ err := b.apiLogin()
+ if err != nil {
+ return err
+ }
+ } else {
+ flog.Info("Connecting using webhookbindaddress (receiving)")
+ b.mh = matterhook.New(b.Config.WebhookURL,
+ matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
+ BindAddress: b.Config.WebhookBindAddress})
+ }
+ go b.handleMatter()
+ return nil
+ }
+ if b.Config.WebhookURL != "" {
+ flog.Info("Connecting using webhookurl (sending)")
b.mh = matterhook.New(b.Config.WebhookURL,
matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
DisableServer: true})
- } else {
- flog.Info("Connecting using token")
- b.mc = matterclient.New(b.Config.Login, b.Config.Password,
- b.Config.Team, b.Config.Server)
- b.mc.SkipTLSVerify = b.Config.SkipTLSVerify
- b.mc.NoTLS = b.Config.NoTLS
- flog.Infof("Connecting %s (team: %s) on %s", b.Config.Login, b.Config.Team, b.Config.Server)
- err := b.mc.Login()
+ if b.Config.Login != "" {
+ flog.Info("Connecting using login/password (receiving)")
+ err := b.apiLogin()
+ if err != nil {
+ return err
+ }
+ go b.handleMatter()
+ }
+ return nil
+ } else if b.Config.Login != "" {
+ flog.Info("Connecting using login/password (sending and receiving)")
+ err := b.apiLogin()
if err != nil {
return err
}
- flog.Info("Connection succeeded")
- b.TeamId = b.mc.GetTeamId()
- go b.mc.WsReceiver()
- go b.mc.StatusLoop()
+ go b.handleMatter()
+ }
+ if b.Config.WebhookBindAddress == "" && b.Config.WebhookURL == "" && b.Config.Login == "" {
+ return errors.New("No connection method found. See that you have WebhookBindAddress, WebhookURL or Login/Password/Server/Team configured.")
}
- go b.handleMatter()
return nil
}
@@ -12411 +14111 @@ func (b *Bmattermost) Send(msg config.Message) error {
func (b *Bmattermost) handleMatter() {
mchan := make(chan *MMMessage)
- if b.Config.WebhookBindAddress != "" && b.Config.WebhookURL != "" {
+ if b.Config.WebhookBindAddress != "" {
flog.Debugf("Choosing webhooks based receiving")
go b.handleMatterHook(mchan)
} else {
- flog.Debugf("Choosing login (api) based receiving")
+ flog.Debugf("Choosing login/password based receiving")
go b.handleMatterClient(mchan)
}
for message := range mchan {
@@ -1853 +20220 @@ func (b *Bmattermost) handleMatterHook(mchan chan *MMMessage) {
mchan <- m
}
}
+
+func (b *Bmattermost) apiLogin() error {
+ b.mc = matterclient.New(b.Config.Login, b.Config.Password,
+ b.Config.Team, b.Config.Server)
+ b.mc.SkipTLSVerify = b.Config.SkipTLSVerify
+ b.mc.NoTLS = b.Config.NoTLS
+ flog.Infof("Connecting %s (team: %s) on %s", b.Config.Login, b.Config.Team, b.Config.Server)
+ err := b.mc.Login()
+ if err != nil {
+ return err
+ }
+ flog.Info("Connection succeeded")
+ b.TeamId = b.mc.GetTeamId()
+ go b.mc.WsReceiver()
+ go b.mc.StatusLoop()
+ return nil
+}
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 6555d40..1e956e9 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -16 +17 @@
package bslack
import (
+ "errors"
"fmt"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/matterhook"
@@ -5322 +5452 @@ func (b *Bslack) Command(cmd string) string {
}
func (b *Bslack) Connect() error {
- if b.Config.WebhookURL != "" && b.Config.WebhookBindAddress != "" {
- flog.Info("Connecting using webhookurl and webhookbindaddress")
- b.mh = matterhook.New(b.Config.WebhookURL,
- matterhook.Config{BindAddress: b.Config.WebhookBindAddress})
- } else if b.Config.WebhookURL != "" {
- flog.Info("Connecting using webhookurl (for posting) and token")
+ if b.Config.WebhookBindAddress != "" {
+ if b.Config.WebhookURL != "" {
+ flog.Info("Connecting using webhookurl (sending) and webhookbindaddress (receiving)")
+ b.mh = matterhook.New(b.Config.WebhookURL,
+ matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
+ BindAddress: b.Config.WebhookBindAddress})
+ } else if b.Config.Token != "" {
+ flog.Info("Connecting using token (sending)")
+ b.sc = slack.New(b.Config.Token)
+ b.rtm = b.sc.NewRTM()
+ go b.rtm.ManageConnection()
+ flog.Info("Connecting using webhookbindaddress (receiving)")
+ b.mh = matterhook.New(b.Config.WebhookURL,
+ matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
+ BindAddress: b.Config.WebhookBindAddress})
+ } else {
+ flog.Info("Connecting using webhookbindaddress (receiving)")
+ b.mh = matterhook.New(b.Config.WebhookURL,
+ matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
+ BindAddress: b.Config.WebhookBindAddress})
+ }
+ go b.handleSlack()
+ return nil
+ }
+ if b.Config.WebhookURL != "" {
+ flog.Info("Connecting using webhookurl (sending)")
b.mh = matterhook.New(b.Config.WebhookURL,
- matterhook.Config{DisableServer: true})
- } else {
- flog.Info("Connecting using token")
+ matterhook.Config{InsecureSkipVerify: b.Config.SkipTLSVerify,
+ DisableServer: true})
+ if b.Config.Token != "" {
+ flog.Info("Connecting using token (receiving)")
+ b.sc = slack.New(b.Config.Token)
+ b.rtm = b.sc.NewRTM()
+ go b.rtm.ManageConnection()
+ go b.handleSlack()
+ }
+ } else if b.Config.Token != "" {
+ flog.Info("Connecting using token (sending and receiving)")
b.sc = slack.New(b.Config.Token)
b.rtm = b.sc.NewRTM()
go b.rtm.ManageConnection()
+ go b.handleSlack()
+ }
+ if b.Config.WebhookBindAddress == "" && b.Config.WebhookURL == "" && b.Config.Token == "" {
+ return errors.New("No connection method found. See that you have WebhookBindAddress, WebhookURL or Token configured.")
}
- flog.Info("Connection succeeded")
- go b.handleSlack()
return nil
}
@@ -797 +1107 @@ func (b *Bslack) Disconnect() error {
func (b *Bslack) JoinChannel(channel string) error {
// we can only join channels using the API
- if b.Config.WebhookURL == "" || b.Config.WebhookBindAddress == "" {
+ if b.Config.WebhookURL == "" && b.Config.WebhookBindAddress == "" {
if strings.HasPrefix(b.Config.Token, "xoxb") {
// TODO check if bot has already joined channel
return nil
@@ -1767 +2077 @@ func (b *Bslack) getChannelByID(ID string) (*slack.Channel, error) {
func (b *Bslack) handleSlack() {
mchan := make(chan *MMMessage)
- if b.Config.WebhookBindAddress != "" && b.Config.WebhookURL != "" {
+ if b.Config.WebhookBindAddress != "" {
flog.Debugf("Choosing webhooks based receiving")
go b.handleMatterHook(mchan)
} else {
