cwinfo/matterbridge
5
0
Fork 0
mirror of https://github.com/cwinfo/matterbridge.git synced 2024-11-22 15:10:28 +00:00
Code Releases Activity

Do not break messages on newline (slack). Closes #258

Browse Source
This commit is contained in:
Wim 2017-09-10 18:19:33 +02:00
parent 86cd7f1ba6
commit 90a61f15cc
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bridge/slack/slack.go
View File

@ -234,25 +234,23 @@ func (b *Bslack) handleSlack() {
if message.Text == "" || message.Username == "" { if message.Text == "" || message.Username == "" {
continue continue
} }
texts := strings.Split(message.Text, "\n") text := message.Text
for _, text := range texts { text = b.replaceURL(text)
text = b.replaceURL(text) text = html.UnescapeString(text)
text = html.UnescapeString(text) flog.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account)
flog.Debugf("Sending message from %s on %s to gateway", message.Username, b.Account) msg := config.Message{Text: text, Username: message.Username, Channel: message.Channel, Account: b.Account, Avatar: b.getAvatar(message.Username), UserID: message.UserID, ID: "slack " + message.Raw.Timestamp}
msg := config.Message{Text: text, Username: message.Username, Channel: message.Channel, Account: b.Account, Avatar: b.getAvatar(message.Username), UserID: message.UserID, ID: "slack " + message.Raw.Timestamp} if message.Raw.SubType == "me_message" {
if message.Raw.SubType == "me_message" { msg.Event = config.EVENT_USER_ACTION
msg.Event = config.EVENT_USER_ACTION
}
if message.Raw.SubType == "channel_leave" || message.Raw.SubType == "channel_join" {
msg.Username = "system"
msg.Event = config.EVENT_JOIN_LEAVE
}
// edited messages have a submessage, use this timestamp
if message.Raw.SubMessage != nil {
msg.ID = "slack " + message.Raw.SubMessage.Timestamp
}
b.Remote <- msg
} }
if message.Raw.SubType == "channel_leave" || message.Raw.SubType == "channel_join" {
msg.Username = "system"
msg.Event = config.EVENT_JOIN_LEAVE
}
// edited messages have a submessage, use this timestamp
if message.Raw.SubMessage != nil {
msg.ID = "slack " + message.Raw.SubMessage.Timestamp
}
b.Remote <- msg
} }
} }