From e4da951cf9941e2046ef979cc5e1dd2093d39208 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 9 Nov 2024 14:33:52 -0500 Subject: [PATCH] Refactor out the two patch user agents --- launcher/src/squareenixlogin.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/launcher/src/squareenixlogin.cpp b/launcher/src/squareenixlogin.cpp index d6b2328..10a3c83 100644 --- a/launcher/src/squareenixlogin.cpp +++ b/launcher/src/squareenixlogin.cpp @@ -22,6 +22,9 @@ const QString platform = QStringLiteral("win32"); const QString bootUpdateChannel = QStringLiteral("ffxivneo_release_boot"); const QString gameUpdateChannel = QStringLiteral("win32"); +const QByteArray patchUserAgent = QByteArrayLiteral("FFXIV PATCH CLIENT"); +const QByteArray macosPatchUserAgent = QByteArrayLiteral("FFXIV-MAC PATCH CLIEN"); + using namespace Qt::StringLiterals; SquareEnixLogin::SquareEnixLogin(LauncherCore &window, QObject *parent) @@ -167,9 +170,9 @@ QCoro::Task SquareEnixLogin::checkBootUpdates() auto request = QNetworkRequest(url); if (m_info->profile->account()->license() == Account::GameLicense::macOS) { - request.setRawHeader(QByteArrayLiteral("User-Agent"), QByteArrayLiteral("FFXIV-MAC PATCH CLIENT")); + request.setHeader(QNetworkRequest::KnownHeaders::UserAgentHeader, macosPatchUserAgent); } else { - request.setRawHeader(QByteArrayLiteral("User-Agent"), QByteArrayLiteral("FFXIV PATCH CLIENT")); + request.setHeader(QNetworkRequest::KnownHeaders::UserAgentHeader, patchUserAgent); } request.setRawHeader(QByteArrayLiteral("Host"), QStringLiteral("patch-bootver.%1").arg(m_launcher.settings()->squareEnixServer()).toUtf8()); @@ -355,7 +358,7 @@ QCoro::Task SquareEnixLogin::registerSession() auto request = QNetworkRequest(url); Utility::setSSL(request); request.setRawHeader(QByteArrayLiteral("X-Hash-Check"), QByteArrayLiteral("enabled")); - request.setRawHeader(QByteArrayLiteral("User-Agent"), QByteArrayLiteral("FFXIV PATCH CLIENT")); + request.setHeader(QNetworkRequest::KnownHeaders::UserAgentHeader, patchUserAgent); request.setHeader(QNetworkRequest::ContentTypeHeader, QByteArrayLiteral("application/x-www-form-urlencoded")); QString report = QStringLiteral("%1=%2\n").arg(m_info->profile->bootVersion(), co_await getBootHash());