cwinfo/matterbridge
5
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2024-11-26 00:51:36 +00:00
Code Releases Activity

Fix regression (slack). Closes #384

Browse Source
This commit is contained in:
Wim 2018-03-05 20:19:43 +01:00
parent 1ec324354b
commit 8d2ce56c37
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bridge/rocketchat/rocketchat.go
View File

@ -53,8 +53,7 @@ func (b *Brocketchat) Send(msg config.Message) (string, error) {
b.Log.Debugf("=> Receiving %#v", msg) b.Log.Debugf("=> Receiving %#v", msg)
if msg.Extra != nil { if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) { for _, rmsg := range helper.HandleExtra(&msg, b.General) {
matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, matterMessage := matterhook.OMessage{IconURL: b.GetString("IconURL"), Channel: rmsg.Channel, UserName: rmsg.Username, Text: rmsg.Text}
Text: rmsg.Text}
b.mh.Send(matterMessage) b.mh.Send(matterMessage)
} }
if len(msg.Extra["file"]) > 0 { if len(msg.Extra["file"]) > 0 {

4
bridge/slack/slack.go
View File

@ -256,11 +256,11 @@ func (b *Bslack) handleSlack() {
b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account) b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account)
// cleanup the message // cleanup the message
message.Text = b.replaceURL(message.Text)
message.Text = html.UnescapeString(message.Text)
message.Text = b.replaceMention(message.Text) message.Text = b.replaceMention(message.Text)
message.Text = b.replaceVariable(message.Text) message.Text = b.replaceVariable(message.Text)
message.Text = b.replaceChannel(message.Text) message.Text = b.replaceChannel(message.Text)
message.Text = b.replaceURL(message.Text)
message.Text = html.UnescapeString(message.Text)
// Add the avatar // Add the avatar
message.Avatar = b.getAvatar(message.Username) message.Avatar = b.getAvatar(message.Username)