mirror of
https://github.com/42wim/matterbridge
synced 2024-11-03 15:40:24 +00:00
Remove empty newlines from messages (telegram) #399
This commit is contained in:
parent
a12a8d4fe2
commit
a83831e68d
@ -88,3 +88,13 @@ func HandleDownloadData(flog *log.Entry, msg *config.Message, name, comment, url
|
||||
}
|
||||
msg.Extra["file"] = append(msg.Extra["file"], config.FileInfo{Name: name, Data: data, URL: url, Comment: comment, Avatar: avatar})
|
||||
}
|
||||
|
||||
func RemoveEmptyNewLines(msg string) string {
|
||||
lines := ""
|
||||
for _, line := range strings.Split(msg, "\n") {
|
||||
if line != "" {
|
||||
lines += line + "\n"
|
||||
}
|
||||
}
|
||||
return lines
|
||||
}
|
||||
|
@ -222,18 +222,12 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
|
||||
usernameReply = "unknown"
|
||||
}
|
||||
if !b.GetBool("QuoteDisable") {
|
||||
rmsg.Text = rmsg.Text + " (re @" + usernameReply + ":"
|
||||
// remove empty lines
|
||||
for _, m := range strings.Split(message.ReplyToMessage.Text, "\n") {
|
||||
if m != "" {
|
||||
rmsg.Text = rmsg.Text + m
|
||||
}
|
||||
}
|
||||
rmsg.Text = rmsg.Text + ")"
|
||||
rmsg.Text = rmsg.Text + " (re @" + usernameReply + ":" + message.ReplyToMessage.Text + ")"
|
||||
}
|
||||
}
|
||||
|
||||
if rmsg.Text != "" || len(rmsg.Extra) > 0 {
|
||||
rmsg.Text = helper.RemoveEmptyNewLines(rmsg.Text)
|
||||
rmsg.Avatar = helper.GetAvatar(b.avatarMap, strconv.Itoa(message.From.ID), b.General)
|
||||
|
||||
b.Log.Debugf("<= Sending message from %s on %s to gateway", rmsg.Username, b.Account)
|
||||
|
Loading…
Reference in New Issue
Block a user