adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Temporary fix to work with mx-reply tags

Browse Source
remotes/origin/HEAD
Konstantinos Sideris 6 years ago
parent bf4d559523
commit 9f3de8679d
2 changed files with 15 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      src/Utils.cpp
  2. 6
      src/timeline/TimelineItem.cpp

15
src/Utils.cpp
Unescape View File

@ -285,7 +285,14 @@ utils::humanReadableFingerprint(const QString &ed25519)
QString QString
utils::linkifyMessage(const QString &body) utils::linkifyMessage(const QString &body)
{ {
QXmlStreamReader xml{"<html>" + body + "</html>"}; // Convert to valid XML.
auto doc = QString("<html>%1</html>").arg(body);
doc.replace("<mx-reply>", "");
doc.replace("</mx-reply>", "");
doc.replace("<br>", "<br></br>");
QXmlStreamReader xml{doc};
QString textString; QString textString;
while (!xml.atEnd() && !xml.hasError()) { while (!xml.atEnd() && !xml.hasError()) {
@ -330,8 +337,10 @@ utils::linkifyMessage(const QString &body)
} }
if (xml.hasError()) { if (xml.hasError()) {
// qWarning() << "error while parsing xml"; qWarning() << "error while parsing xml" << xml.errorString() << doc;
return body; doc.replace("<html>", "");
doc.replace("</html>", "");
return doc;
} }
return textString; return textString;

6
src/timeline/TimelineItem.cpp
Unescape View File

@ -494,7 +494,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Notice
const auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts); const auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts);
auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed()); auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed());
auto body = QString::fromStdString(event.content.body).trimmed(); auto body = QString::fromStdString(event.content.body).trimmed().toHtmlEscaped();
descriptionMsg_ = {Cache::displayName(room_id_, sender), descriptionMsg_ = {Cache::displayName(room_id_, sender),
sender, sender,
@ -539,7 +539,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Emote>
const auto sender = QString::fromStdString(event.sender); const auto sender = QString::fromStdString(event.sender);
auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed()); auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed());
auto body = QString::fromStdString(event.content.body).trimmed(); auto body = QString::fromStdString(event.content.body).trimmed().toHtmlEscaped();
auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts); auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts);
auto displayName = Cache::displayName(room_id_, sender); auto displayName = Cache::displayName(room_id_, sender);
@ -586,7 +586,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
const auto sender = QString::fromStdString(event.sender); const auto sender = QString::fromStdString(event.sender);
auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed()); auto formatted_body = utils::linkifyMessage(utils::getMessageBody(event).trimmed());
auto body = QString::fromStdString(event.content.body).trimmed(); auto body = QString::fromStdString(event.content.body).trimmed().toHtmlEscaped();
auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts); auto timestamp = QDateTime::fromMSecsSinceEpoch(event.origin_server_ts);
auto displayName = Cache::displayName(room_id_, sender); auto displayName = Cache::displayName(room_id_, sender);

Write Preview
Loading…
Cancel
Save