From 6ce57d6a908736292e08eb93b2693678ea4b4083 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 18 May 2023 10:06:29 -0400
Subject: [PATCH] link-previews: strip Windows EOLs too when parsing meta tags
Change-Id: I54cd44a3ef388321c411b7c45985aa1808d380c8
---
src/app/previewengine.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/previewengine.cpp b/src/app/previewengine.cpp
index bd9f1bc65..5f4490f11 100644
--- a/src/app/previewengine.cpp
+++ b/src/app/previewengine.cpp
@@ -27,7 +27,8 @@ getInnerHtml(const QString& tag)
return match.hasMatch() ? match.captured(1) : QString {};
};
-const QRegularExpression PreviewEngine::newlineRe("\\n");
+// Portable newline regex.
+const QRegularExpression PreviewEngine::newlineRe("\\r?\\n");
PreviewEngine::PreviewEngine(ConnectivityMonitor* cm, QObject* parent)
: NetworkManager(cm, parent)
@@ -83,7 +84,6 @@ PreviewEngine::getDescription(HtmlParser::TagInfoList& metaTags)
QString
PreviewEngine::getImage(HtmlParser::TagInfoList& metaTags)
{
- static const QRegularExpression newlineRe("\\n");
// Try with og/twitter props
QString image = getTagContent(metaTags[TidyTag_META], "image");
if (image.isEmpty()) { // Try with href of link tag (rel="image_src")
--
GitLab