0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Use constants for user agents

Browse Source 
Here lies yet another early-stage move to debrand the MultiMC codebase,
as well as reducing the burden of updating strings across the codebase
for a future MultiMC6.
This commit is contained in:
Jamie Mansfield 2021-07-01 19:24:29 +01:00
parent df1d3dbae2
commit 20c393321c
No known key found for this signature in database
GPG Key ID: 36F61598F39F67B0
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/logic/net/Download.cpp
View File

@ -15,6 +15,7 @@
#include "Download.h" #include "Download.h"
#include "BuildConfig.h"
#include <QFileInfo> #include <QFileInfo>
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>
@ -94,7 +95,7 @@ void Download::start()
return; return;
} }
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0"); request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT);
QNetworkReply *rep = ENV.qnam().get(request); QNetworkReply *rep = ENV.qnam().get(request);

3
api/logic/net/PasteUpload.cpp
View File

@ -5,6 +5,7 @@
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QFile> #include <QFile>
#include <BuildConfig.h>
PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window) PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window)
{ {
@ -34,7 +35,7 @@ bool PasteUpload::validateText()
void PasteUpload::executeTask() void PasteUpload::executeTask()
{ {
QNetworkRequest request(QUrl("https://api.paste.ee/v1/pastes")); QNetworkRequest request(QUrl("https://api.paste.ee/v1/pastes"));
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
request.setRawHeader("Content-Type", "application/json"); request.setRawHeader("Content-Type", "application/json");
request.setRawHeader("Content-Length", QByteArray::number(m_jsonContent.size())); request.setRawHeader("Content-Length", QByteArray::number(m_jsonContent.size()));

2
api/logic/screenshots/ImgurAlbumCreation.cpp
View File

@ -20,7 +20,7 @@ void ImgurAlbumCreation::start()
{ {
m_status = Job_InProgress; m_status = Job_InProgress;
QNetworkRequest request(m_url); QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
request.setRawHeader("Accept", "application/json"); request.setRawHeader("Accept", "application/json");

2
api/logic/screenshots/ImgurUpload.cpp
View File

@ -23,7 +23,7 @@ void ImgurUpload::start()
finished = false; finished = false;
m_status = Job_InProgress; m_status = Job_InProgress;
QNetworkRequest request(m_url); QNetworkRequest request(m_url);
request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)"); request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT_UNCACHED);
request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3"); request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
request.setRawHeader("Accept", "application/json"); request.setRawHeader("Accept", "application/json");

5
buildconfig/BuildConfig.h
View File

@ -31,6 +31,11 @@ public:
/// URL for the updater's channel /// URL for the updater's channel
QString CHANLIST_URL; QString CHANLIST_URL;
/// User-Agent to use.
QString USER_AGENT = "MultiMC/5.0";
/// User-Agent to use for uncached requests.
QString USER_AGENT_UNCACHED = "MultiMC/5.0 (Uncached)";
/// Google analytics ID /// Google analytics ID
QString ANALYTICS_ID; QString ANALYTICS_ID;