From 097dac4f7966759800d9a96c8a17d4008eae9d61 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 5 Nov 2017 16:23:19 -0800 Subject: [PATCH] Fix wacky newline/linkification interaction --- src/TimelineItem.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc index bd778175..a99170b9 100644 --- a/src/TimelineItem.cc +++ b/src/TimelineItem.cc @@ -92,8 +92,8 @@ TimelineItem::TimelineItem(events::MessageEventType ty, } body = body.toHtmlEscaped(); - body.replace("\n", "
"); body.replace(URL_REGEX, URL_HTML); + body.replace("\n", "
"); generateTimestamp(timestamp); if (withSender) { @@ -199,12 +199,12 @@ TimelineItem::TimelineItem(const events::MessageEvent &event, descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.timestamp()))}; auto body = event.content().body().trimmed().toHtmlEscaped(); - body.replace("\n", "
"); auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp()); generateTimestamp(timestamp); body.replace(URL_REGEX, URL_HTML); + body.replace("\n", "
"); body = "" + body + ""; if (with_sender) { @@ -246,8 +246,8 @@ TimelineItem::TimelineItem(const events::MessageEvent &event, generateTimestamp(timestamp); emoteMsg = emoteMsg.toHtmlEscaped(); - emoteMsg.replace("\n", "
"); emoteMsg.replace(URL_REGEX, URL_HTML); + emoteMsg.replace("\n", "
"); if (with_sender) { generateBody(displayName, emoteMsg); @@ -286,8 +286,8 @@ TimelineItem::TimelineItem(const events::MessageEvent &event, generateTimestamp(timestamp); body = body.toHtmlEscaped(); - body.replace("\n", "
"); body.replace(URL_REGEX, URL_HTML); + body.replace("\n", "
"); if (with_sender) { generateBody(displayName, body);