Thumbnail

rani/matterbridge.git

Clone URL: https://git.buni.party/rani/matterbridge.git

commit 1312b2b3fe3ab5feb4f0632c6382bd8129252f81 Author: Jerry Heiselman <jheiselman@users.noreply.github.com> Date: Mon Jul 17 11:33:28 2017 +0000 Suppress parent message when child message is received (slack) (#218) * Suppress parent message when child message is received When a thread is started in Slack and a user makes a comment on the thread, matterbridge sends the original parent message again on each child comment. This change suppresses that. * Update slack.go Moved determination of ThreadTimestamp to handleSlackClient so the MMMessage struct doesn't need to be modified * Ran 'go fmt' diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go index 4f9b7fc..b6753bb 100644 --- a/bridge/slack/slack.go +++ b/bridge/slack/slack.go @@ -2417 +2417 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {   // ignore first message   if count > 0 {   flog.Debugf("Receiving from slackclient %#v", ev) - if !b.Config.EditDisable && ev.SubMessage != nil { + if !b.Config.EditDisable && ev.SubMessage != nil && ev.SubMessage.ThreadTimestamp != ev.SubMessage.Timestamp {   flog.Debugf("SubMessage %#v", ev.SubMessage)   ev.User = ev.SubMessage.User   ev.Text = ev.SubMessage.Text + b.Config.EditSuffix