commit 4f980632dae9ad71b74fb84d594b77a15aff46f0
Author: Wim <wim@42.be>
Date: Sun May 27 22:30:17 2018 +0000
Fix iconurl regression (mattermost,slack,rocketchat). Closes #430
diff --git a/bridge/mattermost/mattermost.go b/bridge/mattermost/mattermost.go
index 51d3242..ae5d9db 100644
--- a/bridge/mattermost/mattermost.go
+++ b/bridge/mattermost/mattermost.go
@@ -3687 +3688 @@ func (b *Bmattermost) sendWebhook(msg config.Message) (string, error) {
if msg.Extra != nil {
// this sends a message only if we received a config.EVENT_FILE_FAILURE_SIZE
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text, Props: make(map[string]interface{})}
+ iconURL := config.GetIconURL(&rmsg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text, Props: make(map[string]interface{})}
matterMessage.Props["matterbridge_"+b.uuid] = true
b.mh.Send(matterMessage)
}
@@ -3847 +3858 @@ func (b *Bmattermost) sendWebhook(msg config.Message) (string, error) {
}
}
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: msg.Channel, UserName: msg.Username, Text: msg.Text, Props: make(map[string]interface{})}
+ iconURL := config.GetIconURL(&msg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: msg.Channel, UserName: msg.Username, Text: msg.Text, Props: make(map[string]interface{})}
if msg.Avatar != "" {
matterMessage.IconURL = msg.Avatar
}
diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go
index 31de933..2793018 100644
--- a/bridge/rocketchat/rocketchat.go
+++ b/bridge/rocketchat/rocketchat.go
@@ -537 +538 @@ func (b *Brocketchat) Send(msg config.Message) (string, error) {
b.Log.Debugf("=> Receiving %#v", msg)
if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
+ iconURL := config.GetIconURL(&rmsg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
b.mh.Send(matterMessage)
}
if len(msg.Extra["file"]) > 0 {
@@ -667 +678 @@ func (b *Brocketchat) Send(msg config.Message) (string, error) {
}
}
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL")}
+ iconURL := config.GetIconURL(&msg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL}
matterMessage.Channel = msg.Channel
matterMessage.UserName = msg.Username
matterMessage.Type = ""
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 58abf48..8760142 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -6107 +6108 @@ func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
if msg.Extra != nil {
// this sends a message only if we received a config.EVENT_FILE_FAILURE_SIZE
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: msg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
+ iconURL := config.GetIconURL(&rmsg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL, Channel: msg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
b.mh.Send(matterMessage)
}
@@ -6337 +6348 @@ func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
}
}
- matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Attachments: attachs, Channel: msg.Channel, UserName: msg.Username, Text: msg.Text}
+ iconURL := config.GetIconURL(&msg, b.GetString("iconurl"))
+ matterMessage := matterhook.OMessage{IconURL: iconURL, Attachments: attachs, Channel: msg.Channel, UserName: msg.Username, Text: msg.Text}
if msg.Avatar != "" {
matterMessage.IconURL = msg.Avatar
}
