d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 12:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't send useless formatted_bodies

Browse source
This commit is contained in:
Nicolas Werner 2020-01-27 17:25:09 +01:00
parent 9c368fa7f4
commit e81a4e8f9a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Utils.cpp
View file

@ -397,6 +397,10 @@ utils::markdownToHtml(const QString &text)
auto result = linkifyMessage(escapeBlacklistedHtml(QString::fromStdString(html))).trimmed(); auto result = linkifyMessage(escapeBlacklistedHtml(QString::fromStdString(html))).trimmed();
if (result.count("<p>") == 1 && result.startsWith("<p>") && result.endsWith("</p>")) {
result = result.mid(3, result.size() - 3 - 4);
}
return result; return result;
} }

7
src/timeline/TimelineViewManager.cpp
View file

@ -188,8 +188,13 @@ TimelineViewManager::queueTextMessage(const QString &msg, const std::optional<Re
text.body = msg.trimmed().toStdString(); text.body = msg.trimmed().toStdString();
if (settings->isMarkdownEnabled()) { if (settings->isMarkdownEnabled()) {
text.format = "org.matrix.custom.html";
text.formatted_body = utils::markdownToHtml(msg).toStdString(); text.formatted_body = utils::markdownToHtml(msg).toStdString();
// Don't send formatted_body, when we don't need to
if (text.formatted_body == text.body)
text.formatted_body = "";
else
text.format = "org.matrix.custom.html";
} }
if (related) { if (related) {