From 9e8f0b7409ff34b1235908b4c9d619b2a43d7a11 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Fri, 7 Sep 2018 20:05:30 +0300 Subject: Initial support for sending markdown formatted messages fixes #283 --- src/timeline/TimelineItem.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/timeline/TimelineItem.cpp') diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp index 267dea15..8e0401a8 100644 --- a/src/timeline/TimelineItem.cpp +++ b/src/timeline/TimelineItem.cpp @@ -265,16 +265,16 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty, auto timestamp = QDateTime::currentDateTime(); if (ty == mtx::events::MessageType::Emote) { - body = QString("* %1 %2").arg(displayName).arg(body); + body = QString("%1 %2").arg(displayName).arg(body); descriptionMsg_ = {"", userid, body, utils::descriptiveTime(timestamp), timestamp}; } else { descriptionMsg_ = { "You: ", userid, body, utils::descriptiveTime(timestamp), timestamp}; } - body = body.toHtmlEscaped(); - body.replace(conf::strings::url_regex, conf::strings::url_html); - body.replace("\n", "
"); + body = QString::fromStdString(utils::markdownToHtml(body)); + body = utils::linkifyMessage(body); + generateTimestamp(timestamp); if (withSender) { @@ -489,7 +489,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts); auto displayName = Cache::displayName(room_id_, sender); - auto emoteMsg = QString("* %1 %2").arg(displayName).arg(formatted_body); + auto emoteMsg = QString("%1 %2").arg(displayName).arg(formatted_body); descriptionMsg_ = {"", sender, emoteMsg, utils::descriptiveTime(timestamp), timestamp}; -- cgit 1.5.1