rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix inline image escape order

This commit is contained in:
Nicolas Werner 2022-08-18 22:05:47 +02:00
parent 08b304eccf
commit ff87bef030
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/timeline/TimelineModel.cpp
View File

@ -600,6 +600,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
if (isReply)
formattedBody_ = formattedBody_.remove(replyFallback);
}
formattedBody_ = utils::escapeBlacklistedHtml(formattedBody_);
// TODO(Nico): Don't parse html with a regex
const static QRegularExpression matchIsImg(QStringLiteral("<img [^>]+>"));
@ -637,8 +638,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
formattedBody_.replace(curImg, imgReplacement);
}
return QVariant(
utils::replaceEmoji(utils::linkifyMessage(utils::escapeBlacklistedHtml(formattedBody_))));
return QVariant(utils::replaceEmoji(utils::linkifyMessage(formattedBody_)));
}
case Url:
return QVariant(QString::fromStdString(url(event)));