commit 2ad0a123c1e06e23a8a5a4f220d81d8661e16a13
Author: Wim <wim@42.be>
Date: Thu May 14 00:27:34 2020 +0000
Do not use webhooks when token is configured (slack) (fixes #1123) (#1134)
diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go
index 56e112d..d05a358 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -167 +167 @@ var ErrEventIgnored = errors.New("this event message should ignored")
func (b *Bslack) handleSlack() {
messages := make(chan *config.Message)
- if b.GetString(incomingWebhookConfig) != "" {
+ if b.GetString(incomingWebhookConfig) != "" && b.GetString(tokenConfig) == "" {
b.Log.Debugf("Choosing webhooks based receiving")
go b.handleMatterHook(messages)
} else {
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index a9a89c3..384581e 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -2047 +2047 @@ func (b *Bslack) Send(msg config.Message) (string, error) {
}
// Use webhook to send the message
- if b.GetString(outgoingWebhookConfig) != "" {
+ if b.GetString(outgoingWebhookConfig) != "" && b.GetString(tokenConfig) == "" {
return "", b.sendWebhook(msg)
}
return b.sendRTM(msg)
