jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-28 13:42:01 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix loop from webhook by adding matterbridge prop (mattermost). Closes #261

Browse Source
This commit is contained in:
Wim 2017-09-18 23:53:30 +02:00
parent 1a40b0c1e9
commit 47b7fae61b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bridge/mattermost/mattermost.go
View File

@ -163,6 +163,9 @@ func (b *Bmattermost) Send(msg config.Message) (string, error) {
matterMessage.UserName = nick matterMessage.UserName = nick
matterMessage.Type = "" matterMessage.Type = ""
matterMessage.Text = message matterMessage.Text = message
matterMessage.Text = message
matterMessage.Props = make(map[string]interface{})
matterMessage.Props["matterbridge"] = true
err := b.mh.Send(matterMessage) err := b.mh.Send(matterMessage)
if err != nil { if err != nil {
flog.Info(err) flog.Info(err)
@ -226,6 +229,10 @@ func (b *Bmattermost) handleMatterClient(mchan chan *MMMessage) {
props := message.Post.Props props := message.Post.Props
if props != nil { if props != nil {
if _, ok := props["matterbridge"].(bool); ok {
flog.Debugf("sent by matterbridge, ignoring")
continue
}
if _, ok := props["override_username"].(string); ok { if _, ok := props["override_username"].(string); ok {
message.Username = props["override_username"].(string) message.Username = props["override_username"].(string)
} }