commit 68abffc34e71efae893588f1fede2db4756c816d
Author: Wim <wim@42.be>
Date: Mon Mar 05 20:19:43 2018 +0000
Fix regression (slack). Closes #384
diff --git a/bridge/rocketchat/rocketchat.go b/bridge/rocketchat/rocketchat.go
index fa2c31d..31de933 100644
--- a/bridge/rocketchat/rocketchat.go
+++ b/bridge/rocketchat/rocketchat.go
@@ -538 +537 @@ 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}
+ matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
b.mh.Send(matterMessage)
}
if len(msg.Extra["file"]) > 0 {
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index c7c2fac..4d12841 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -25611 +25611 @@ func (b *Bslack) handleSlack() {
b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account)
// cleanup the message
- message.Text = b.replaceURL(message.Text)
- message.Text = html.UnescapeString(message.Text)
message.Text = b.replaceMention(message.Text)
message.Text = b.replaceVariable(message.Text)
message.Text = b.replaceChannel(message.Text)
+ message.Text = b.replaceURL(message.Text)
+ message.Text = html.UnescapeString(message.Text)
// Add the avatar
message.Avatar = b.getAvatar(message.Username)
