FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatically de-escape all contents

Browse Source
This commit is contained in:
Martin Rotter 2024-04-03 12:18:15 +02:00
parent 70c923bea8
commit c65fb31f19
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/github-actions/build-linux-mac.sh
View File

@ -59,7 +59,7 @@ else
USE_QT6="ON" USE_QT6="ON"
QTPATH="$(pwd)/Qt" QTPATH="$(pwd)/Qt"
QTVERSION="6.5.3" QTVERSION="6.7.0"
QTBIN="$QTPATH/$QTVERSION/$QTOS/bin" QTBIN="$QTPATH/$QTVERSION/$QTOS/bin"
# Install "aqtinstall" from its master branch to have latest code. # Install "aqtinstall" from its master branch to have latest code.

2
resources/scripts/github-actions/build-windows.ps1
View File

@ -31,7 +31,7 @@ if ($use_qt5 -eq "ON") {
$qt_version = "5.15.2" $qt_version = "5.15.2"
} }
else { else {
$qt_version = "6.5.3" $qt_version = "6.7.0"
} }
$is_qt_6 = $qt_version.StartsWith("6") $is_qt_6 = $qt_version.StartsWith("6")

7
src/librssguard/core/message.cpp
View File

@ -123,7 +123,7 @@ void Message::sanitize(const Feed* feed, bool fix_future_datetimes) {
static QRegularExpression reg_news(QSL("([\\n\\r])|(^\\s)")); static QRegularExpression reg_news(QSL("([\\n\\r])|(^\\s)"));
// Sanitize title. // Sanitize title.
m_title = qApp->web()->stripTags(qApp->web()->unescapeHtml(m_title)); m_title = qApp->web()->stripTags(WebFactory::unescapeHtml(m_title));
m_title = m_title m_title = m_title
@ -140,7 +140,10 @@ void Message::sanitize(const Feed* feed, bool fix_future_datetimes) {
.remove(QChar(65279)); .remove(QChar(65279));
// Sanitize author. // Sanitize author.
m_author = qApp->web()->stripTags(qApp->web()->unescapeHtml(m_author)); m_author = qApp->web()->stripTags(WebFactory::unescapeHtml(m_author));
// Just unescape HTML entities. Other formatting is done by viewers.
m_contents = WebFactory::unescapeHtml(m_contents);
// Sanitize URL. // Sanitize URL.
m_url = m_url.trimmed(); m_url = m_url.trimmed();

2
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -518,7 +518,7 @@ void TextBrowserViewer::downloadNextNeededResource() {
QMetaObject::invokeMethod(m_resourceDownloader, QMetaObject::invokeMethod(m_resourceDownloader,
"manipulateData", "manipulateData",
Qt::ConnectionType::QueuedConnection, Qt::ConnectionType::QueuedConnection,
Q_ARG(QString, qApp->web()->unescapeHtml(res.toString())), Q_ARG(QString, WebFactory::unescapeHtml(res.toString())),
Q_ARG(QNetworkAccessManager::Operation, QNetworkAccessManager::Operation::GetOperation), Q_ARG(QNetworkAccessManager::Operation, QNetworkAccessManager::Operation::GetOperation),
Q_ARG(QByteArray, {}), Q_ARG(QByteArray, {}),
Q_ARG(int, 5000)); Q_ARG(int, 5000));