From bf4d559523e956523a617213fa1cc3c36fab24e4 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 13 Sep 2018 11:02:54 +0300 Subject: Strip paragraph tags fixes #438 --- src/timeline/TimelineView.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/timeline/TimelineView.cpp') diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp index 08d506bf..90e116c1 100644 --- a/src/timeline/TimelineView.cpp +++ b/src/timeline/TimelineView.cpp @@ -1236,8 +1236,10 @@ toRoomMessage(const PendingMessage &m) auto html = utils::markdownToHtml(m.body); mtx::events::msg::Emote emote; - emote.body = utils::stripHtml(html); - emote.formatted_body = html.toStdString(); + emote.body = m.body.trimmed().toStdString(); + + if (html != m.body.trimmed().toHtmlEscaped()) + emote.formatted_body = html.toStdString(); return emote; } @@ -1261,8 +1263,10 @@ toRoomMessage(const PendingMessage &m) auto html = utils::markdownToHtml(m.body); mtx::events::msg::Text text; - text.body = utils::stripHtml(html); - text.formatted_body = html.toStdString(); + text.body = m.body.trimmed().toStdString(); + + if (html != m.body.trimmed().toHtmlEscaped()) + text.formatted_body = html.toStdString(); return text; } -- cgit 1.4.1