ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stripBlockTags Fixes

Browse Source 
Make the code more robust by accounting for things like tag attributes
This commit is contained in:
James Graham
2024-03-04 21:05:11 +00:00
parent 78271a3738
commit 09c31b20e6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/texthandler.cpp
View File

@@ -350,8 +350,9 @@ MessageComponent TextHandler::nextBlock(const QString &string,
QString TextHandler::stripBlockTags(QString string, const QString &tagType) const QString TextHandler::stripBlockTags(QString string, const QString &tagType) const
{ {
if (blockTags.contains(tagType) && tagType != QStringLiteral("ol") && tagType != QStringLiteral("ul") && tagType != QStringLiteral("table")) { if (blockTags.contains(tagType) && tagType != QStringLiteral("ol") && tagType != QStringLiteral("ul") && tagType != QStringLiteral("table")
string.replace(QLatin1String("<%1>").arg(tagType), QString()).replace(QLatin1String("</%1>").arg(tagType), QString()); && string.startsWith(QLatin1String("<%1").arg(tagType))) {
string.remove(0, string.indexOf(u'>') + 1).remove(string.indexOf(QLatin1String("</%1>").arg(tagType)), string.size());
} }
if (string.startsWith(QStringLiteral("\n"))) { if (string.startsWith(QStringLiteral("\n"))) {
@@ -363,7 +364,7 @@ QString TextHandler::stripBlockTags(QString string, const QString &tagType) cons
if (tagType == QStringLiteral("pre")) { if (tagType == QStringLiteral("pre")) {
if (string.startsWith(QStringLiteral("<code"))) { if (string.startsWith(QStringLiteral("<code"))) {
string.remove(0, string.indexOf(u'>') + 1); string.remove(0, string.indexOf(u'>') + 1);
string.remove(string.size() - 7, string.size()); string.remove(string.indexOf(QLatin1String("</code>")), string.size());
} }
if (string.endsWith(QStringLiteral("\n"))) { if (string.endsWith(QStringLiteral("\n"))) {
string.remove(string.size() - 1, string.size()); string.remove(string.size() - 1, string.size());
@@ -371,8 +372,8 @@ QString TextHandler::stripBlockTags(QString string, const QString &tagType) cons
} }
if (tagType == QStringLiteral("blockquote")) { if (tagType == QStringLiteral("blockquote")) {
if (string.startsWith(QStringLiteral("<p>"))) { if (string.startsWith(QStringLiteral("<p>"))) {
string.remove(0, 3); string.remove(0, string.indexOf(u'>') + 1);
string.remove(string.size() - 4, string.size()); string.remove(string.indexOf(QLatin1String("</p>")), string.size());
} }
if (!string.startsWith(u'"')) { if (!string.startsWith(u'"')) {
string.prepend(u'"'); string.prepend(u'"');