Skip to content
Snippets Groups Projects
Commit e1977544 authored by Benjamin Saunders's avatar Benjamin Saunders Committed by mujx
Browse files

Fix newlines not being displayed (#122)

Fixes #64
parent d0d15f8f
No related branches found
No related tags found
No related merge requests found
...@@ -92,6 +92,7 @@ TimelineItem::TimelineItem(events::MessageEventType ty, ...@@ -92,6 +92,7 @@ TimelineItem::TimelineItem(events::MessageEventType ty,
} }
body = body.toHtmlEscaped(); body = body.toHtmlEscaped();
body.replace("\n", "<br/>");
body.replace(URL_REGEX, URL_HTML); body.replace(URL_REGEX, URL_HTML);
generateTimestamp(timestamp); generateTimestamp(timestamp);
...@@ -197,7 +198,8 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Notice> &event, ...@@ -197,7 +198,8 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Notice> &event,
" sent a notification", " sent a notification",
descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.timestamp()))}; descriptiveTime(QDateTime::fromMSecsSinceEpoch(event.timestamp()))};
auto body = event.content().body().trimmed().toHtmlEscaped(); auto body = event.content().body().trimmed().toHtmlEscaped();
body.replace("\n", "<br/>");
auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp()); auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp());
generateTimestamp(timestamp); generateTimestamp(timestamp);
...@@ -244,6 +246,7 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Emote> &event, ...@@ -244,6 +246,7 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Emote> &event,
generateTimestamp(timestamp); generateTimestamp(timestamp);
emoteMsg = emoteMsg.toHtmlEscaped(); emoteMsg = emoteMsg.toHtmlEscaped();
emoteMsg.replace("\n", "<br/>");
emoteMsg.replace(URL_REGEX, URL_HTML); emoteMsg.replace(URL_REGEX, URL_HTML);
if (with_sender) { if (with_sender) {
...@@ -283,6 +286,7 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Text> &event, ...@@ -283,6 +286,7 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Text> &event,
generateTimestamp(timestamp); generateTimestamp(timestamp);
body = body.toHtmlEscaped(); body = body.toHtmlEscaped();
body.replace("\n", "<br/>");
body.replace(URL_REGEX, URL_HTML); body.replace(URL_REGEX, URL_HTML);
if (with_sender) { if (with_sender) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment