diff options
| author | Tulir Asokan <tulir@maunium.net> | 2019-04-07 22:54:55 +0300 |
|---|---|---|
| committer | Tulir Asokan <tulir@maunium.net> | 2019-04-07 22:54:55 +0300 |
| commit | 5d7c1a4caab46f7e981aed7b9cc825b7602b4098 (patch) | |
| tree | 536f231aa79c6736a0dc9e721bc51d77719deb12 /ui/messages/parser | |
| parent | e6180c9b6fb12686926cf8d3bc27f31f6489129b (diff) | |
Improve handling of multiple linebreaks
Diffstat (limited to 'ui/messages/parser')
| -rw-r--r-- | ui/messages/parser/htmlparser.go | 2 | ||||
| -rw-r--r-- | ui/messages/parser/parser.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/messages/parser/htmlparser.go b/ui/messages/parser/htmlparser.go index 464459e..e658c61 100644 --- a/ui/messages/parser/htmlparser.go +++ b/ui/messages/parser/htmlparser.go @@ -289,7 +289,7 @@ func (parser *htmlParser) tagNodeToEntity(node *html.Node, stripLinebreak bool) case "h1", "h2", "h3", "h4", "h5", "h6": return parser.headerToEntity(node, stripLinebreak) case "br": - return &messages.BaseHTMLEntity{Tag: "br", Block: true} + return messages.NewBreakEntity() case "b", "strong", "i", "em", "s", "del", "u", "ins", "font": return parser.basicFormatToEntity(node, stripLinebreak) case "a": diff --git a/ui/messages/parser/parser.go b/ui/messages/parser/parser.go index 4181c09..e48bd5f 100644 --- a/ui/messages/parser/parser.go +++ b/ui/messages/parser/parser.go @@ -113,7 +113,7 @@ func ParseMessage(matrix ifc.MatrixContainer, room *rooms.Room, evt *mautrix.Eve replyToEvt.Content.FormattedBody = html.EscapeString(replyToEvt.Content.Body) } evt.Content.FormattedBody = fmt.Sprintf( - "In reply to <a href='https://matrix.to/#/%[1]s'>%[1]s</a><blockquote>%[2]s</blockquote><br/>%[3]s", + "In reply to <a href='https://matrix.to/#/%[1]s'>%[1]s</a><blockquote>%[2]s</blockquote><br/><br/>%[3]s", replyToEvt.Sender, replyToEvt.Content.FormattedBody, evt.Content.FormattedBody) } else { evt.Content.FormattedBody = fmt.Sprintf( |