thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mentions with markdown and in edits

Browse source
This commit is contained in:
Nicolas Werner 2024-05-31 18:17:35 +02:00
parent 1c5f747856
commit ec9af40fc5
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
7 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/Utils.cpp
View file

@ -581,6 +581,34 @@ utils::linkifyMessage(const QString &body)
return doc;
}
QString
utils::escapeMentionMarkdown(QString input)
{
input = input.toHtmlEscaped();
constexpr std::array<char, 10> markdownChars = {
'\\',
'`',
'*',
'_',
/*'{', '}',*/ '[',
']',
'<',
'>',
/* '(', ')', '#', '-', '+', '.', '!', */ '~',
'|',
};
QByteArray replacement = "\\\\";
for (char c : markdownChars) {
replacement[1] = c;
input.replace(QChar::fromLatin1(c), QLatin1StringView(replacement));
}
return input;
}
QString
utils::escapeBlacklistedHtml(const QString &rawStr)
{
@ -1139,18 +1167,19 @@ utils::getFormattedQuoteBody(const RelatedInfo &related, const QString &html)
return QStringLiteral("sent a video");
}
default: {
return related.quoted_formatted_body;
return escapeBlacklistedHtml(related.quoted_formatted_body);
}
}
};
return QStringLiteral("<mx-reply><blockquote><a "
"href=\"https://matrix.to/#/%1/%2\">In reply "
"to</a> <a href=\"https://matrix.to/#/%3\">%4</a><br"
"/>%5</blockquote></mx-reply>")
.arg(related.room,
QString::fromStdString(related.related_event),
related.quoted_user,
related.quoted_user,
QUrl::toPercentEncoding(related.quoted_user),
related.quoted_user.toHtmlEscaped(),
getFormattedBody()) +
html;
}