From c4fd4c2f7465ab124bf3f796b87cc4ec13bb3d20 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Wed, 7 Jun 2023 19:17:48 +0200
Subject: [PATCH 1/8] fix: save settings not showing in QML version (fix #2978)

---
 .../settings/pages/SaveSettingsPage.qml          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml b/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml
index 50178b56d..ff809e0ef 100644
--- a/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml
+++ b/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml
@@ -68,7 +68,7 @@ ColumnLayout {
     Repeater {
         model: ListModel {
             ListElement {
-                name: globals.tagTypes["general"]
+                name: qsTr("General")
                 key: "general"
                 enableShorter: false
                 defaultEmpty: ""
@@ -76,7 +76,7 @@ ColumnLayout {
                 defaultSeparator: " "
             }
             ListElement {
-                name: globals.tagTypes["artist"]
+                name: qsTr("Artist")
                 key: "artist"
                 enableShorter: false
                 defaultEmpty: "anonymous"
@@ -84,7 +84,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["copyright"]
+                name: qsTr("Copyright")
                 key: "copyright"
                 enableShorter: true
                 defaultEmpty: "misc"
@@ -92,7 +92,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["character"]
+                name: qsTr("Character")
                 key: "character"
                 enableShorter: false
                 defaultEmpty: "unknown"
@@ -100,7 +100,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["model"]
+                name: qsTr("Model")
                 key: "model"
                 enableShorter: false
                 defaultEmpty: "unknown"
@@ -108,7 +108,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["photo_set"]
+                name: qsTr("Photo set")
                 key: "photo_set"
                 enableShorter: false
                 defaultEmpty: "unknown"
@@ -116,7 +116,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["species"]
+                name: qsTr("Species")
                 key: "species"
                 enableShorter: false
                 defaultEmpty: "unknown"
@@ -124,7 +124,7 @@ ColumnLayout {
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["meta"]
+                name: qsTr("Meta")
                 key: "meta"
                 enableShorter: false
                 defaultEmpty: "none"

From 43de3d8c913cc9df5e261f5ce5475cf606cf7e40 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Thu, 8 Jun 2023 22:20:00 +0200
Subject: [PATCH 2/8] fix: remove warning in GA4 code about User-Agent type

---
 src/lib/src/utils/google-analytics-4.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/src/utils/google-analytics-4.cpp b/src/lib/src/utils/google-analytics-4.cpp
index 123a7400c..88b4c0421 100644
--- a/src/lib/src/utils/google-analytics-4.cpp
+++ b/src/lib/src/utils/google-analytics-4.cpp
@@ -136,7 +136,7 @@ void GoogleAnalytics4::sendEvent(const QString &name, const QVariantMap &paramet
 	url.setQuery(query);
 
 	QNetworkRequest request(url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, userAgent());
+	request.setHeader(QNetworkRequest::UserAgentHeader, userAgent().toLatin1());
 	QNetworkReply *reply = m_networkAccessManager->get(request);
 
 	connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);

From ac2f8a570f757c40182f076958cb857bec5ade79 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Tue, 20 Jun 2023 01:26:46 +0200
Subject: [PATCH 3/8] build: enable arm64-v8a ABI build

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c38f6b29..4767ea521 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -583,7 +583,7 @@ jobs:
         export ANDROID_NDK_ROOT="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}"
         cmake ../src -DCMAKE_BUILD_TYPE=Release -DNIGHTLY=$GRABBER_IS_NIGHTLY -DCOMMIT="$GITHUB_SHA" -DVERSION="$GRABBER_VERSION" -DKEYSTORE_PASSWORD="${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
           -DANDROID_ABI:STRING=armeabi-v7a \
-          -DANDROID_BUILD_ABI_arm64-v8a:BOOL=OFF \
+          -DANDROID_BUILD_ABI_arm64-v8a:BOOL=ON \
           -DANDROID_BUILD_ABI_armeabi-v7a:BOOL=ON \
           -DANDROID_BUILD_ABI_x86:BOOL=OFF \
           -DANDROID_BUILD_ABI_x86_64:BOOL=OFF \

From 820771e34a7468b37813b84dbda35a201d0800c5 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Fri, 23 Jun 2023 00:38:43 +0200
Subject: [PATCH 4/8] fix: stop using infinite scroll when disabled (fix #2987)

---
 src/gui-qml/src/components/GalleryScreen.qml | 2 +-
 src/gui-qml/src/components/SearchScreen.qml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui-qml/src/components/GalleryScreen.qml b/src/gui-qml/src/components/GalleryScreen.qml
index 7bf0ffe5f..c02d3af2a 100644
--- a/src/gui-qml/src/components/GalleryScreen.qml
+++ b/src/gui-qml/src/components/GalleryScreen.qml
@@ -89,7 +89,7 @@ Page {
                 onOpenImage: mainStackView.push(imageScreen, { index: index })
                 onRefresh: galleryLoader.load()
                 onAppendNext: {
-                    if (galleryLoader.hasNext) {
+                    if (infiniteScroll && galleryLoader.hasNext) {
                         root.appendResults = true
                         root.page++
                         galleryLoader.load()
diff --git a/src/gui-qml/src/components/SearchScreen.qml b/src/gui-qml/src/components/SearchScreen.qml
index a2634d94d..3fdb9b1c0 100644
--- a/src/gui-qml/src/components/SearchScreen.qml
+++ b/src/gui-qml/src/components/SearchScreen.qml
@@ -162,7 +162,7 @@ Page {
                 onOpenImage: mainStackView.push(imageScreen, { index: index })
                 onRefresh: load()
                 onAppendNext: {
-                    if (pageLoader.hasNext) {
+                    if (infiniteScroll && pageLoader.hasNext) {
                         searchTab.appendResults = true
                         searchTab.page++
                         searchTab.load()

From 6983afa6de1e35a58ac838343214736cb14797ba Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Fri, 23 Jun 2023 01:05:57 +0200
Subject: [PATCH 5/8] fix: page count parsing on r34.us (fix #2990)

---
 src/sites/Rule34.us Gelbooru/model.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/sites/Rule34.us Gelbooru/model.ts b/src/sites/Rule34.us Gelbooru/model.ts
index d82cf30a5..feaf3ae4a 100755
--- a/src/sites/Rule34.us Gelbooru/model.ts	
+++ b/src/sites/Rule34.us Gelbooru/model.ts	
@@ -31,10 +31,15 @@ export const source: ISource = {
                     return "/index.php?r=posts/index&q=" + search + (page === 0 ? '' : "&page=" + page);
                 },
                 parse: (src: string): IParsedSearch => {
-                    const pageCount = Grabber.regexToConst("page", '<div class="pagination">\\W*(<a.*>.*<\\/a>\\W*)*(<a href="[^"]+page=(?<page>\\d+)".*>.*<\\/a>\\W*)<\\/div>', src);
+                    const pageMatch = Grabber.regexMatch('<div class="pagination">\\W*(?:<[ab].*>.*<\\/[ab]>\\W*)*(?:<[ab] href="[^"]+page=(?<page_arg>\\d+)".*>.*<\\/[ab]>|<[ab].*>(?<page_real>\\d+)<\\/[ab]>)\\s*<\\/div>', src);
+                    const pageCount = pageMatch && "page_arg" in pageMatch
+                        ? parseInt(pageMatch["page_arg"], 10) + 1
+                        : pageMatch && "page_real" in pageMatch
+                            ? parseInt(pageMatch["page_real"], 10)
+                            : undefined;
                     return {
                         images: Grabber.regexToImages('<a id="(?<id>\\d+)" href="[^"]+"><img +src="(?<preview_url>[^"]*thumbnail_(?<md5>[^.]+)\\.[^"]+)" title=" *(?<tags>[^"]*)" .+?</a></div>', src).map(completeImage),
-                        pageCount: pageCount ? (parseInt(pageCount, 10) + 1) : undefined,
+                        pageCount,
                         tags: Grabber.regexToTags('<li><a[^>]*>\\+</a><a [^>]*>-</a> <span [^>]*>\\? <a href="[^"]*">(?<name>[^<]+)</a> (?<count>\\d+)</span></li>', src),
                     };
                 },

From ffaf7633c3b03ea3fc800e1a3cfdd6e0e9ff74b5 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Sun, 25 Jun 2023 01:03:08 +0200
Subject: [PATCH 6/8] fix: users not created in GA4

---
 src/lib/src/analytics.h                       |   4 +-
 src/lib/src/utils/google-analytics-4.cpp      | 197 ----------------
 src/lib/src/utils/google-analytics-4.h        |  53 -----
 .../qt-google-analytics.cpp                   | 217 ++++++++++++++++++
 .../qt-google-analytics/qt-google-analytics.h |  65 ++++++
 .../user-agent-client-hints.cpp               | 167 ++++++++++++++
 .../user-agent-client-hints.h                 |  34 +++
 7 files changed, 485 insertions(+), 252 deletions(-)
 delete mode 100644 src/lib/src/utils/google-analytics-4.cpp
 delete mode 100644 src/lib/src/utils/google-analytics-4.h
 create mode 100644 src/lib/vendor/qt-google-analytics/qt-google-analytics.cpp
 create mode 100644 src/lib/vendor/qt-google-analytics/qt-google-analytics.h
 create mode 100644 src/lib/vendor/qt-google-analytics/user-agent-client-hints.cpp
 create mode 100644 src/lib/vendor/qt-google-analytics/user-agent-client-hints.h

diff --git a/src/lib/src/analytics.h b/src/lib/src/analytics.h
index 5200888da..fb7b64844 100644
--- a/src/lib/src/analytics.h
+++ b/src/lib/src/analytics.h
@@ -3,7 +3,7 @@
 
 #include <QVariantMap>
 #include "vendor/ganalytics.h"
-#include "utils/google-analytics-4.h"
+#include "vendor/qt-google-analytics/qt-google-analytics.h"
 
 
 class QString;
@@ -38,7 +38,7 @@ class Analytics
 
 		bool m_enabled = false;
 		GAnalytics m_googleAnalytics;
-		GoogleAnalytics4 m_ga4;
+		QtGoogleAnalytics m_ga4;
 };
 
 #endif // ANALYTICS_H
diff --git a/src/lib/src/utils/google-analytics-4.cpp b/src/lib/src/utils/google-analytics-4.cpp
deleted file mode 100644
index 88b4c0421..000000000
--- a/src/lib/src/utils/google-analytics-4.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-#include "google-analytics-4.h"
-#include <QCoreApplication>
-#include <QRandomGenerator>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QString>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QVariant>
-#include <QNetworkAccessManager>
-#include <QOperatingSystemVersion>
-
-#ifdef QT_GUI_LIB
-	#include <QGuiApplication>
-	#include <QScreen>
-#endif
-#ifdef Q_OS_ANDROID
-	#include <QAndroidJniObject>
-#endif
-
-#define MEASUREMENT_ENDPOINT_JSON "https://www.google-analytics.com/mp/collect"
-#define MEASUREMENT_ENDPOINT_WEB "https://www.google-analytics.com/g/collect"
-#define CLIENT_ID_SETTINGS_KEY "QtGoogleAnalytics4/ClientId"
-
-
-#include <QSettings>
-#include "functions.h"
-GoogleAnalytics4::GoogleAnalytics4(QObject *parent)
-	: QObject(parent)
-{
-	m_networkAccessManager = new QNetworkAccessManager(this);
-	m_sessionId = QDateTime::currentMSecsSinceEpoch() / 1000; // QRandomGenerator::global()->generate();
-
-	QSettings settings(savePath("settings.ini"), QSettings::IniFormat);
-	if (!settings.contains(CLIENT_ID_SETTINGS_KEY)) {
-		m_clientId = QUuid::createUuid().toString().mid(1, 36);
-		settings.setValue(CLIENT_ID_SETTINGS_KEY, m_clientId);
-	} else {
-		m_clientId = settings.value(CLIENT_ID_SETTINGS_KEY).toString();
-	}
-}
-
-
-void GoogleAnalytics4::setApiSecret(const QString &apiSecret)
-{
-	if (m_apiSecret != apiSecret) {
-		m_apiSecret = apiSecret;
-		emit apiSecretChanged();
-	}
-}
-
-QString GoogleAnalytics4::apiSecret() const
-{
-	return m_apiSecret;
-}
-
-void GoogleAnalytics4::setMeasurementId(const QString &measurementId)
-{
-	if (m_measurementId != measurementId) {
-		m_measurementId = measurementId;
-		emit measurementIdChanged();
-	}
-}
-
-QString GoogleAnalytics4::measurementId() const
-{
-	return m_measurementId;
-}
-
-void GoogleAnalytics4::setUserId(const QString &userId)
-{
-	if (m_userId != userId) {
-		m_userId = userId;
-		emit userIdChanged();
-	}
-}
-
-QString GoogleAnalytics4::userId() const
-{
-	return m_userId;
-}
-
-#include <QEventLoop>
-#include <QNetworkReply>
-
-void GoogleAnalytics4::sendEvent(const QString &name, const QVariantMap &parameters)
-{
-	QUrl url(MEASUREMENT_ENDPOINT_WEB);
-
-	QUrlQuery query {
-		{ "v", "2" },
-		{ "tid", m_measurementId },
-		{ "_p", QString::number(QRandomGenerator::global()->generate()) },
-		{ "cid", m_clientId },
-		{ "ul", QLocale::system().name().toLower().replace("_", "-") },
-		#ifdef QT_GUI_LIB
-			{ "sr", screenResolution() },
-		#endif
-		{ "_s", "1" },
-		{ "sid", QString::number(m_sessionId) },
-		{ "sct", "1" },
-		{ "en", name },
-	};
-	if (!m_userId.isEmpty()) {
-		query.addQueryItem("uid", m_userId);
-	}
-
-	// Operating System information
-	const QOperatingSystemVersion os = QOperatingSystemVersion::current();
-	query.addQueryItem("uaa", "x86"); // QSysInfo::currentCpuArchitecture());
-	query.addQueryItem("uab", QString::number(sizeof(void*) * 8));
-	query.addQueryItem("uamb", os.isAnyOfType({ QOperatingSystemVersion::Android, QOperatingSystemVersion::IOS }) ? "1" : "0");
-	#if defined(Q_OS_ANDROID)
-		query.addQueryItem("uam", QAndroidJniObject::getStaticObjectField<jstring>("android/os/Build", "MODEL").toString());
-	#elif defined(Q_OS_IOS)
-		query.addQueryItem("uam", "iPhone");
-	#else
-		query.addQueryItem("uam", "");
-	#endif
-	query.addQueryItem("uap", os.name());
-	query.addQueryItem("uapv", userAgentPlatformVersion());
-	query.addQueryItem("uaw", "0");
-
-	// Events
-	for (auto it = parameters.constBegin(); it != parameters.constEnd(); ++it) {
-		if (it.value().type() == QVariant::Type::Int) {
-			query.addQueryItem("epn." + it.key(), QString::number(it.value().toInt()));
-		} else {
-			query.addQueryItem("ep." + it.key(), it.value().toString());
-		}
-	}
-
-	// TODO: user_properties
-
-	url.setQuery(query);
-
-	QNetworkRequest request(url);
-	request.setHeader(QNetworkRequest::UserAgentHeader, userAgent().toLatin1());
-	QNetworkReply *reply = m_networkAccessManager->get(request);
-
-	connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
-}
-
-
-#ifdef QT_GUI_LIB
-	QString GoogleAnalytics4::screenResolution() const
-	{
-		const QScreen *screen = QGuiApplication::primaryScreen();
-		if (screen == nullptr) {
-			return {};
-		}
-
-		const QSize size = screen->size();
-		return QString("%1x%2").arg(size.width()).arg(size.height());
-	}
-#endif
-
-QString GoogleAnalytics4::userAgent() const
-{
-	#if false and defined(Q_OS_ANDROID)
-		QAndroidJniObject jsText = QAndroidJniObject::fromString("http.agent");
-		QAndroidJniObject ua = QAndroidJniObject::callStaticMethod<jstring>(
-		"System",
-		"getProperty",
-		"(Ljava/lang/String;)Z",
-		jsText.object<jstring>()
-		);
-		return ua.toString();
-	#endif
-
-	return "";
-
-	const QString appName = QCoreApplication::instance()->applicationName();
-	const QString appVersion = QCoreApplication::instance()->applicationVersion();
-	const QString systemInfo = QString("%1 %2").arg(QOperatingSystemVersion::current().name(), userAgentPlatformVersion());
-
-	return QString("%1/%2 (%3) QtGoogleAnalytics4/1.0 (Qt/%4)").arg(appName, appVersion, systemInfo, QT_VERSION_STR);
-}
-
-QString GoogleAnalytics4::userAgentPlatformVersion() const
-{
-	const QOperatingSystemVersion os = QOperatingSystemVersion::current();
-
-	QString ret;
-	const int segmentCount = os.segmentCount();
-	if (segmentCount > 0) {
-		ret += QString("%1").arg(os.majorVersion());
-	}
-	if (segmentCount > 1) {
-		ret += QString(".%1").arg(os.minorVersion());
-	}
-	if (segmentCount > 2) {
-		ret += QString(".%1").arg(os.microVersion());
-	}
-	return ret;
-}
diff --git a/src/lib/src/utils/google-analytics-4.h b/src/lib/src/utils/google-analytics-4.h
deleted file mode 100644
index 8225453a8..000000000
--- a/src/lib/src/utils/google-analytics-4.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef GOOGLE_ANALYTICS_4_H
-#define GOOGLE_ANALYTICS_4_H
-
-#include <QObject>
-#include <QVariantMap>
-
-
-class QNetworkAccessManager;
-
-class GoogleAnalytics4 : public QObject
-{
-	Q_OBJECT
-
-	Q_PROPERTY(QString apiSecret READ apiSecret WRITE setApiSecret NOTIFY apiSecretChanged)
-	Q_PROPERTY(QString measurementId READ measurementId WRITE setMeasurementId NOTIFY measurementIdChanged)
-	Q_PROPERTY(QString userId READ userId WRITE setUserId NOTIFY userIdChanged)
-
-	public:
-		explicit GoogleAnalytics4(QObject *parent = nullptr);
-
-	public:
-		void setApiSecret(const QString &apiSecret);
-		QString apiSecret() const;
-		void setMeasurementId(const QString &measurementId);
-		QString measurementId() const;
-		void setUserId(const QString &userId);
-		QString userId() const;
-
-	public slots:
-		void sendEvent(const QString &name, const QVariantMap &parameters = {});
-
-	signals:
-		void apiSecretChanged();
-		void measurementIdChanged();
-		void userIdChanged();
-
-	protected:
-		#ifdef QT_GUI_LIB
-			QString screenResolution() const;
-		#endif
-		QString userAgent() const;
-		QString userAgentPlatformVersion() const;
-
-	private:
-		QNetworkAccessManager *m_networkAccessManager;
-		unsigned int m_sessionId;
-		QString m_apiSecret;
-		QString m_measurementId;
-		QString m_clientId;
-		QString m_userId;
-};
-
-#endif // GOOGLE_ANALYTICS_4_H
diff --git a/src/lib/vendor/qt-google-analytics/qt-google-analytics.cpp b/src/lib/vendor/qt-google-analytics/qt-google-analytics.cpp
new file mode 100644
index 000000000..2998cb283
--- /dev/null
+++ b/src/lib/vendor/qt-google-analytics/qt-google-analytics.cpp
@@ -0,0 +1,217 @@
+#include "qt-google-analytics.h"
+#include <QCoreApplication>
+#include <QRandomGenerator>
+#include <QSettings>
+#include <QString>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QVariant>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QOperatingSystemVersion>
+
+#ifdef QT_GUI_LIB
+	#include <QGuiApplication>
+	#include <QScreen>
+#endif
+#ifdef Q_OS_ANDROID
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		#include <QJniObject>
+	#else
+		#include <QAndroidJniObject>
+		typedef QAndroidJniObject QJniObject;
+	#endif
+#endif
+
+#define MEASUREMENT_ENDPOINT_WEB "https://www.google-analytics.com/g/collect"
+#define CLIENT_ID_SETTINGS_KEY "QtGoogleAnalytics/ClientId"
+#define SESSION_START_INTERVAL_SECONDS 1800
+
+
+#include "functions.h"
+QtGoogleAnalytics::QtGoogleAnalytics(QObject *parent)
+	: QObject(parent)
+{
+	m_networkAccessManager = new QNetworkAccessManager(this);
+	m_sessionId = QDateTime::currentSecsSinceEpoch();
+
+	QSettings settings(savePath("settings.ini"), QSettings::IniFormat);
+	if (!settings.contains(CLIENT_ID_SETTINGS_KEY)) {
+		m_clientId = QString("%1.%2").arg(QString::number(QRandomGenerator::global()->generate()), QString::number(QDateTime::currentSecsSinceEpoch()));
+		settings.setValue(CLIENT_ID_SETTINGS_KEY, m_clientId);
+		m_isFirstVisit = true;
+	} else {
+		m_clientId = settings.value(CLIENT_ID_SETTINGS_KEY).toString();
+	}
+}
+
+QtGoogleAnalytics::QtGoogleAnalytics(const QString &measurementId, QObject *parent)
+	: QtGoogleAnalytics(parent)
+{
+	m_measurementId = measurementId;
+}
+
+
+void QtGoogleAnalytics::setMeasurementId(const QString &measurementId)
+{
+	if (m_measurementId != measurementId) {
+		m_measurementId = measurementId;
+		emit measurementIdChanged();
+	}
+}
+
+QString QtGoogleAnalytics::measurementId() const
+{
+	return m_measurementId;
+}
+
+void QtGoogleAnalytics::setUserId(const QString &userId)
+{
+	if (m_userId != userId) {
+		m_userId = userId;
+		emit userIdChanged();
+	}
+}
+
+QString QtGoogleAnalytics::userId() const
+{
+	return m_userId;
+}
+
+void QtGoogleAnalytics::setUserProperties(const QVariantMap &userProperties)
+{
+	if (m_userProperties != userProperties) {
+		m_userProperties = userProperties;
+		emit userPropertiesChanged();
+	}
+}
+
+QVariantMap QtGoogleAnalytics::userProperties() const
+{
+	return m_userProperties;
+}
+
+void QtGoogleAnalytics::setDebugModeEnabled(bool debugModeEnabled)
+{
+	if (m_debugModeEnabled != debugModeEnabled) {
+		m_debugModeEnabled = debugModeEnabled;
+		emit debugModeEnabledChanged();
+	}
+}
+
+bool QtGoogleAnalytics::debugModeEnabled() const
+{
+	return m_debugModeEnabled;
+}
+
+
+void QtGoogleAnalytics::sendEvent(const QString &name, const QVariantMap &parameters)
+{
+	QUrl url(MEASUREMENT_ENDPOINT_WEB);
+
+	QUrlQuery query {
+		{ "v", "2" },
+		{ "tid", m_measurementId },
+		{ "_p", QString::number(QRandomGenerator::global()->generate()) },
+		{ "cid", m_clientId },
+		{ "ul", QLocale::system().name().toLower().replace("_", "-") },
+		#ifdef QT_GUI_LIB
+			{ "sr", screenResolution() },
+		#endif
+		{ "_s", "1" },
+		{ "sid", QString::number(m_sessionId) },
+		{ "sct", "1" },
+		{ "_et", "1" }, // Necessary for users to be created
+		{ "en", name },
+
+		// Operating System information
+		{ "uaa", m_uach.arch() },
+		{ "uab", m_uach.bitness() },
+		{ "uamb", m_uach.mobile() ? "1" : "0" },
+		{ "uam", m_uach.model() },
+		{ "uap", m_uach.platform() },
+		{ "uapv", m_uach.platformVersion() },
+		{ "uaw", m_uach.wow64() ? "1" : "0" },
+	};
+	if (!m_userId.isEmpty()) {
+		query.addQueryItem("uid", m_userId);
+	}
+	if (m_debugModeEnabled) {
+		query.addQueryItem("_dbg", "1");
+	}
+	if (!m_lastEvent.isValid()) {
+		query.addQueryItem("_nsi", "1");
+	}
+	if (!m_lastEvent.isValid() || m_lastEvent.secsTo(QDateTime::currentDateTimeUtc()) > SESSION_START_INTERVAL_SECONDS) {
+		query.addQueryItem("_ss", "1");
+	}
+	if (m_isFirstVisit) {
+		query.addQueryItem("_fv", "1");
+	}
+
+	// Events
+	for (auto it = parameters.constBegin(); it != parameters.constEnd(); ++it) {
+		if (it.value().type() == QVariant::Type::Int) {
+			query.addQueryItem("epn." + it.key(), QString::number(it.value().toInt()));
+		} else {
+			query.addQueryItem("ep." + it.key(), it.value().toString());
+		}
+	}
+
+	// User properties
+	for (auto it = m_userProperties.constBegin(); it != m_userProperties.constEnd(); ++it) {
+		if (it.value().type() == QVariant::Type::Int) {
+			query.addQueryItem("upn." + it.key(), QString::number(it.value().toInt()));
+		} else {
+			query.addQueryItem("up." + it.key(), it.value().toString());
+		}
+	}
+
+	url.setQuery(query);
+
+	QNetworkRequest request(url);
+	request.setHeader(QNetworkRequest::UserAgentHeader, userAgent().toLatin1());
+	m_uach.setRequestHeaders(request);
+
+	QNetworkReply *reply = m_networkAccessManager->post(request, QByteArray());
+	connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
+
+	m_lastEvent = QDateTime::currentDateTimeUtc();
+	m_isFirstVisit = false;
+}
+
+
+#ifdef QT_GUI_LIB
+	QString QtGoogleAnalytics::screenResolution() const
+	{
+		const QScreen *screen = QGuiApplication::primaryScreen();
+		if (screen == nullptr) {
+			return {};
+		}
+
+		const QSize size = screen->size();
+		return QString("%1x%2").arg(size.width()).arg(size.height());
+	}
+#endif
+
+QString QtGoogleAnalytics::userAgent() const
+{
+	return "";
+
+	#if defined(Q_OS_ANDROID)
+		// On Android, just use System.getProperty("http.agent")
+		QAndroidJniObject ua = QJniObject::callStaticMethod<jstring>(
+			"System",
+			"getProperty",
+			"(Ljava/lang/String;)Z",
+			QJniObject::fromString("http.agent").object<jstring>()
+		);
+		return ua.toString();
+	#endif
+
+	// On other platforms, use a custom User-Agent
+	const QString appName = QCoreApplication::instance()->applicationName();
+	const QString appVersion = QCoreApplication::instance()->applicationVersion();
+	const QString systemInfo = QString("%1 %2").arg(QOperatingSystemVersion::current().name(), m_uach.platformVersion());
+	return QString("%1/%2 (%3) QtGoogleAnalytics/1.0 (Qt/%4)").arg(appName, appVersion, systemInfo, QT_VERSION_STR);
+}
diff --git a/src/lib/vendor/qt-google-analytics/qt-google-analytics.h b/src/lib/vendor/qt-google-analytics/qt-google-analytics.h
new file mode 100644
index 000000000..04ab8eb28
--- /dev/null
+++ b/src/lib/vendor/qt-google-analytics/qt-google-analytics.h
@@ -0,0 +1,65 @@
+#ifndef QT_GOOGLE_ANALYTICS_H
+#define QT_GOOGLE_ANALYTICS_H
+
+#include <QObject>
+#include <QDateTime>
+#include <QVariantMap>
+#include "user-agent-client-hints.h"
+
+
+class QNetworkAccessManager;
+
+class QtGoogleAnalytics : public QObject
+{
+	Q_OBJECT
+
+	Q_PROPERTY(QString measurementId READ measurementId WRITE setMeasurementId NOTIFY measurementIdChanged)
+	Q_PROPERTY(QString userId READ userId WRITE setUserId NOTIFY userIdChanged)
+	Q_PROPERTY(QVariantMap userProperties READ userProperties WRITE setUserProperties NOTIFY userPropertiesChanged)
+	Q_PROPERTY(bool debugModeEnabled READ debugModeEnabled WRITE setDebugModeEnabled NOTIFY debugModeEnabledChanged)
+
+	public:
+		explicit QtGoogleAnalytics(QObject *parent = nullptr);
+		explicit QtGoogleAnalytics(const QString &measurementId, QObject *parent = nullptr);
+
+	public:
+		void setMeasurementId(const QString &measurementId);
+		QString measurementId() const;
+		void setUserId(const QString &userId);
+		QString userId() const;
+		void setUserProperties(const QVariantMap &userProperties);
+		QVariantMap userProperties() const;
+		void setDebugModeEnabled(bool debugModeEnabled);
+		bool debugModeEnabled() const;
+
+	public slots:
+		void sendEvent(const QString &name, const QVariantMap &parameters = {});
+
+	signals:
+		void measurementIdChanged();
+		void userIdChanged();
+		void userPropertiesChanged();
+		void debugModeEnabledChanged();
+
+	protected:
+		#ifdef QT_GUI_LIB
+			QString screenResolution() const;
+		#endif
+		QString userAgent() const;
+
+	private:
+		QNetworkAccessManager *m_networkAccessManager;
+		UserAgentClientHints m_uach;
+
+		unsigned int m_sessionId;
+		QDateTime m_lastEvent;
+		bool m_isFirstVisit = false;
+
+		QString m_measurementId;
+		QString m_clientId;
+		QString m_userId;
+		QVariantMap m_userProperties;
+		bool m_debugModeEnabled = false;
+};
+
+#endif // QT_GOOGLE_ANALYTICS_H
diff --git a/src/lib/vendor/qt-google-analytics/user-agent-client-hints.cpp b/src/lib/vendor/qt-google-analytics/user-agent-client-hints.cpp
new file mode 100644
index 000000000..c7cf4f46a
--- /dev/null
+++ b/src/lib/vendor/qt-google-analytics/user-agent-client-hints.cpp
@@ -0,0 +1,167 @@
+#include "user-agent-client-hints.h"
+#include <QNetworkRequest>
+#include <QOperatingSystemVersion>
+#include <QString>
+#include <QSysInfo>
+
+#ifdef Q_OS_ANDROID
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		#include <QJniObject>
+	#else
+		#include <QAndroidJniObject>
+		typedef QAndroidJniObject QJniObject;
+	#endif
+#endif
+
+
+UserAgentClientHints::UserAgentClientHints()
+	: m_osVersion(QOperatingSystemVersion::current())
+{}
+
+
+/**
+ * Set the "Sec-CH-UA-*" HTTP headers for the given network request.
+ */
+void UserAgentClientHints::setRequestHeaders(QNetworkRequest &request) const
+{
+	request.setRawHeader("Sec-CH-UA-Arch", arch().toLatin1());
+	request.setRawHeader("Sec-CH-UA-Bitness", bitness().toLatin1());
+	request.setRawHeader("Sec-CH-UA-Form-Factor", formFactor().toLatin1());
+	request.setRawHeader("Sec-CH-UA-Mobile", mobile() ? "?1" : "?0");
+	request.setRawHeader("Sec-CH-UA-Model", model().toLatin1());
+	request.setRawHeader("Sec-CH-UA-Platform", platform().toLatin1());
+	request.setRawHeader("Sec-CH-UA-Platform-Version", platformVersion().toLatin1());
+	request.setRawHeader("Sec-CH-UA-WoW64", wow64() ? "?1" : "?0");
+}
+
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-arch
+ */
+QString UserAgentClientHints::arch() const
+{
+	if (QSysInfo::currentCpuArchitecture().startsWith("arm")) {
+		return "arm";
+	}
+	return "x86";
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-bitness
+ */
+QString UserAgentClientHints::bitness() const
+{
+	return QString::number(sizeof(void*) * 8);
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factor
+ */
+QString UserAgentClientHints::formFactor() const
+{
+	switch (m_osVersion.type()) {
+		case QOperatingSystemVersion::Android:
+		case QOperatingSystemVersion::IOS:
+			return "Mobile"; // TODO: Tablet
+
+		case QOperatingSystemVersion::MacOS:
+		case QOperatingSystemVersion::Windows:
+			return ""; // Desktop // TODO: Windows Mobile / Surface
+
+		case QOperatingSystemVersion::TvOS:
+			return "TV";
+
+		case QOperatingSystemVersion::WatchOS:
+			return "Watch";
+
+		default:
+			return "Unknown";
+	}
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-mobile
+ */
+bool UserAgentClientHints::mobile() const
+{
+	return m_osVersion.isAnyOfType({
+		QOperatingSystemVersion::Android,
+		QOperatingSystemVersion::IOS,
+	});
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-model
+ */
+QString UserAgentClientHints::model() const
+{
+	#if defined(Q_OS_ANDROID)
+		return QJniObject::getStaticObjectField<jstring>("android/os/Build", "MODEL").toString();
+	#elif defined(Q_OS_IOS)
+		return "iPhone"; // TODO: iPad
+	#endif
+
+	return "";
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform
+ */
+QString UserAgentClientHints::platform() const
+{
+	#if defined(Q_OS_LINUX)
+		return "Linux";
+	#endif
+
+	return m_osVersion.name();
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-platform-version
+ */
+QString UserAgentClientHints::platformVersion() const
+{
+	#if defined(Q_OS_LINUX)
+		return "";
+	#endif
+
+	switch (m_osVersion.type()) {
+		case QOperatingSystemVersion::IOS:
+			return ""; // TODO: (UIDevice currentDevice).systemVersion
+
+		case QOperatingSystemVersion::Windows:
+			if (m_osVersion.majorVersion() == 8 && m_osVersion.minorVersion() == 1) {
+				return "0.3.0";
+			}
+			if (m_osVersion.majorVersion() == 8) {
+				return "0.2.0";
+			}
+			if (m_osVersion.majorVersion() == 7) {
+				return "0.1.0";
+			}
+			if (m_osVersion.majorVersion() < 7) {
+				return "0.0.0";
+			}
+			return ""; // TODO: Windows.Foundation.UniversalApiContract
+
+		case QOperatingSystemVersion::Android: // android.os.Build.VERSION.RELEASE
+		case QOperatingSystemVersion::MacOS: // NSProcessInfo.operatingSystemVersion
+		default:
+			const int segmentCount = m_osVersion.segmentCount();
+			if (segmentCount <= 0) {
+				return "";
+			}
+			const int majorVersion = m_osVersion.majorVersion();
+			const int minorVersion = segmentCount > 1 ? m_osVersion.minorVersion() : 0;
+			const int microVersion = segmentCount > 2 ? m_osVersion.microVersion() : 0;
+			return QString("%1.%2.%3").arg(QString::number(majorVersion), QString::number(minorVersion), QString::number(microVersion));
+	}
+}
+
+/**
+ * https://wicg.github.io/ua-client-hints/#sec-ch-ua-wow64
+ */
+bool UserAgentClientHints::wow64() const
+{
+	return false; // TODO
+}
diff --git a/src/lib/vendor/qt-google-analytics/user-agent-client-hints.h b/src/lib/vendor/qt-google-analytics/user-agent-client-hints.h
new file mode 100644
index 000000000..7543d645c
--- /dev/null
+++ b/src/lib/vendor/qt-google-analytics/user-agent-client-hints.h
@@ -0,0 +1,34 @@
+#ifndef USER_AGENT_CLIENT_HINTS_H
+#define USER_AGENT_CLIENT_HINTS_H
+
+#include <QOperatingSystemVersion>
+
+
+class QNetworkRequest;
+class QString;
+
+/**
+ * Basic implementation of the User-Agent Client Hints draft.
+ * https://wicg.github.io/ua-client-hints/
+ */
+class UserAgentClientHints
+{
+	public:
+		explicit UserAgentClientHints();
+
+		void setRequestHeaders(QNetworkRequest &request) const;
+
+		QString arch() const;
+		QString bitness() const;
+		QString formFactor() const;
+		bool mobile() const;
+		QString model() const;
+		QString platform() const;
+		QString platformVersion() const;
+		bool wow64() const;
+
+	private:
+		QOperatingSystemVersion m_osVersion;
+};
+
+#endif // USER_AGENT_CLIENT_HINTS_H

From c795c72a7c2f8481157777a867934392d8f77be5 Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Sun, 25 Jun 2023 15:26:50 +0200
Subject: [PATCH 7/8] fix: renaming images from MD5 for sources with full
 details API

---
 src/gui/src/utils/rename-existing/rename-existing-1.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/src/utils/rename-existing/rename-existing-1.cpp b/src/gui/src/utils/rename-existing/rename-existing-1.cpp
index ff5689d45..e55dbedbd 100644
--- a/src/gui/src/utils/rename-existing/rename-existing-1.cpp
+++ b/src/gui/src/utils/rename-existing/rename-existing-1.cpp
@@ -222,7 +222,7 @@ void RenameExisting1::loadNext()
 
 		// Try to load the image details from the full details API if available
 		Api *api = site->fullDetailsApi();
-		if (api != nullptr) {
+		if (api != nullptr && m_useIdKey) {
 			QString url = api->detailsUrl(m_useIdKey ? det.key.toLongLong() : 0, !m_useIdKey ? det.key : "", site).url;
 			log(QStringLiteral("Loading full image details from `%1`").arg(url), Logger::Info);
 			NetworkReply *reply = site->get(url, Site::QueryType::Details);

From aa029775c210d54256fec3c851327bb65835354f Mon Sep 17 00:00:00 2001
From: Bionus <bio.nus@hotmail.fr>
Date: Sun, 25 Jun 2023 15:33:13 +0200
Subject: [PATCH 8/8] chore: version 7.11.1

---
 docs/_posts/2023-06-25-grabber-7-11-1-released.md | 11 +++++++++++
 scripts/windows-setup/setup.iss                   |  2 +-
 src/CMakeLists.txt                                |  2 +-
 src/dist/linux/org.bionus.Grabber.metainfo.xml    |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 docs/_posts/2023-06-25-grabber-7-11-1-released.md

diff --git a/docs/_posts/2023-06-25-grabber-7-11-1-released.md b/docs/_posts/2023-06-25-grabber-7-11-1-released.md
new file mode 100644
index 000000000..f46c54516
--- /dev/null
+++ b/docs/_posts/2023-06-25-grabber-7-11-1-released.md
@@ -0,0 +1,11 @@
+---
+title: "Grabber 7.11.1 released"
+date: 2023-06-25 16:00 +0200
+categories: release
+---
+
+
+Grabber 7.11.1 has been released.
+
+The list of changes and download links can be found on Github:  
+<https://github.com/Bionus/imgbrd-grabber/releases/tag/v7.11.1>
\ No newline at end of file
diff --git a/scripts/windows-setup/setup.iss b/scripts/windows-setup/setup.iss
index 90500f362..ba72ce5e1 100644
--- a/scripts/windows-setup/setup.iss
+++ b/scripts/windows-setup/setup.iss
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef MyAppVersion
-# define MyAppVersion "7.11.0"
+# define MyAppVersion "7.11.1"
 #endif
 
 #ifndef QtApngDll
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38d21ebc7..751f3f4de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,7 +37,7 @@ if(TRACE)
 endif()
 
 if((NOT DEFINED VERSION) OR ((DEFINED NIGHTLY) AND (NIGHTLY MATCHES "1")))
-	set(VERSION "7.11.0")
+	set(VERSION "7.11.1")
 else()
 	string(REGEX REPLACE "^v" "" VERSION "${VERSION}")
 endif()
diff --git a/src/dist/linux/org.bionus.Grabber.metainfo.xml b/src/dist/linux/org.bionus.Grabber.metainfo.xml
index 996004b0c..9a3841425 100644
--- a/src/dist/linux/org.bionus.Grabber.metainfo.xml
+++ b/src/dist/linux/org.bionus.Grabber.metainfo.xml
@@ -43,6 +43,7 @@
 	<url type="contribute">https://github.com/Bionus/imgbrd-grabber/blob/master/CONTRIBUTING.md</url>
 
 	<releases>
+		<release  version="7.11.1" date="2023-06-25" />
 		<release  version="7.11.0" date="2023-06-05" />
 		<release  version="7.10.1" date="2023-01-07" />
 		<release  version="7.10.0" date="2022-12-16" />