From bd97357f8d30322dc9c9745c47b9461d862844ba Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 22 Jul 2017 20:03:40 +0200 Subject: [PATCH] Disable message from other bots when using webhooks (slack) --- bridge/slack/slack.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 72392a67..6617f823 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -222,6 +222,9 @@ func (b *Bslack) handleSlack() { if b.Config.WebhookURL == "" && b.Config.WebhookBindAddress == "" && message.Username == b.si.User.Name { continue } + if message.Text == "" || message.Username == "" { + continue + } texts := strings.Split(message.Text, "\n") for _, text := range texts { text = b.replaceURL(text) @@ -279,7 +282,8 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) { } m.Raw = ev m.Text = b.replaceMention(m.Text) - if ev.BotID != "" { + // when using webhookURL we can't check if it's our webhook or not for now + if ev.BotID != "" && b.Config.WebhookURL == "" { bot, err := b.rtm.GetBotInfo(ev.BotID) if err != nil { continue