From c9cfa59f5453add42fb3dd9cc29bdc0d692b2077 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Thu, 14 May 2020 00:27:34 +0200
Subject: Do not use webhooks when token is configured (slack) (fixes #1123)
 (#1134)

---
 bridge/slack/slack.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bridge/slack/slack.go')

diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index a9a89c31..384581ef 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -204,7 +204,7 @@ 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)
-- 
cgit v1.2.3