commit c7f3dd877a4a8219f14fab8b840f2b9b82cc3ef5
Author: Wim <wim@42.be>
Date: Thu Apr 19 12:53:49 2018 +0000
Remove empty newlines from messages (telegram) #399
diff --git a/bridge/helper/helper.go b/bridge/helper/helper.go
index 8178974..7edffb8 100644
--- a/bridge/helper/helper.go
+++ b/bridge/helper/helper.go
@@ -883 +8813 @@ 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
+}
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index d2f229f..ee7309e 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -22218 +22212 @@ 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)
