From 64b57f2da339d38b0cd79c3e20f480b90531d180 Mon Sep 17 00:00:00 2001 From: Wim Date: Wed, 27 Mar 2019 22:54:18 +0100 Subject: Ignore message_replied and hidden messages (slack). Fixes #709 (#779) --- bridge/slack/handlers.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go index b7563931..87102636 100644 --- a/bridge/slack/handlers.go +++ b/bridge/slack/handlers.go @@ -130,12 +130,18 @@ func (b *Bslack) skipMessageEvent(ev *slack.MessageEvent) bool { return true } - // It seems ev.SubMessage.Edited == nil when slack unfurls. - // Do not forward these messages. See Github issue #266. - if ev.SubMessage != nil && - ev.SubMessage.ThreadTimestamp != ev.SubMessage.Timestamp && - ev.SubMessage.Edited == nil { - return true + if ev.SubMessage != nil { + // It seems ev.SubMessage.Edited == nil when slack unfurls. + // Do not forward these messages. See Github issue #266. + if ev.SubMessage.ThreadTimestamp != ev.SubMessage.Timestamp && + ev.SubMessage.Edited == nil { + return true + } + // see hidden subtypes at https://api.slack.com/events/message + // these messages are sent when we add a message to a thread #709 + if ev.SubType == "message_replied" && ev.Hidden { + return true + } } if len(ev.Files) > 0 { -- cgit v1.2.3