From 9dcd51fb80baa75c50323b8094552bfd660a77e8 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 15 Jul 2017 16:49:47 +0200 Subject: [PATCH] Refactor connecting logic slack/mattermost. Fixes #216 --- bridge/mattermost/mattermost.go | 78 +++++++++++++++++++++++---------- bridge/slack/slack.go | 57 ++++++++++++++++++------ 2 files changed, 100 insertions(+), 35 deletions(-) diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go index d4258345..3a16f6a2 100644 --- a/bridge/mattermost/mattermost.go +++ b/bridge/mattermost/mattermost.go @@ -1,6 +1,7 @@ package bmattermost import ( + "errors" "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/matterclient" "github.com/42wim/matterbridge/matterhook" @@ -53,33 +54,49 @@ 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 } @@ -124,11 +141,11 @@ 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 { @@ -185,3 +202,20 @@ 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 6555d40b..1e956e9c 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -1,6 +1,7 @@ package bslack import ( + "errors" "fmt" "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/matterhook" @@ -53,22 +54,52 @@ 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") + 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{BindAddress: b.Config.WebhookBindAddress}) - } else if b.Config.WebhookURL != "" { - flog.Info("Connecting using webhookurl (for posting) and token") - 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 } @@ -79,7 +110,7 @@ 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 @@ -176,7 +207,7 @@ 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 {