commit d60df57e5ea2840ddd985ea155f59f00e16682c2
Author: Wim <wim@42.be>
Date: Mon Sep 18 23:53:30 2017 +0000
Fix loop from webhook by adding matterbridge prop (mattermost). Closes #261
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index f9e350e..bedd07a 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -1636 +1639 @@ func (b *Bmattermost) Send(msg config.Message) (string, error) {
matterMessage.UserName = nick
matterMessage.Type = ""
matterMessage.Text = message
+ matterMessage.Text = message
+ matterMessage.Props = make(map[string]interface{})
+ matterMessage.Props["matterbridge"] = true
err := b.mh.Send(matterMessage)
if err != nil {
flog.Info(err)
@@ -2266 +22910 @@ func (b *Bmattermost) handleMatterClient(mchan chan *MMMessage) {
props := message.Post.Props
if props != nil {
+ if _, ok := props["matterbridge"].(bool); ok {
+ flog.Debugf("sent by matterbridge, ignoring")
+ continue
+ }
if _, ok := props["override_username"].(string); ok {
message.Username = props["override_username"].(string)
}
