aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/services
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/minecraft/services')
-rw-r--r--launcher/minecraft/services/CapeChange.cpp32
-rw-r--r--launcher/minecraft/services/CapeChange.h20
-rw-r--r--launcher/minecraft/services/SkinDelete.cpp17
-rw-r--r--launcher/minecraft/services/SkinDelete.h13
-rw-r--r--launcher/minecraft/services/SkinUpload.cpp21
-rw-r--r--launcher/minecraft/services/SkinUpload.h20
6 files changed, 53 insertions, 70 deletions
diff --git a/launcher/minecraft/services/CapeChange.cpp b/launcher/minecraft/services/CapeChange.cpp
index 1d5ea36d..f87da13e 100644
--- a/launcher/minecraft/services/CapeChange.cpp
+++ b/launcher/minecraft/services/CapeChange.cpp
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -35,27 +35,25 @@
#include "CapeChange.h"
-#include <QNetworkRequest>
#include <QHttpMultiPart>
+#include <QNetworkRequest>
#include "Application.h"
-CapeChange::CapeChange(QObject *parent, QString token, QString cape)
- : Task(parent), m_capeId(cape), m_token(token)
-{
-}
+CapeChange::CapeChange(QObject* parent, QString token, QString cape) : Task(parent), m_capeId(cape), m_token(token) {}
-void CapeChange::setCape(QString& cape) {
+void CapeChange::setCape(QString& cape)
+{
QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/capes/active"));
auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_token).toLocal8Bit());
- QNetworkReply *rep = APPLICATION->network()->put(request, requestString.toUtf8());
+ QNetworkReply* rep = APPLICATION->network()->put(request, requestString.toUtf8());
setStatus(tr("Equipping cape"));
m_reply = shared_qobject_ptr<QNetworkReply>(rep);
connect(rep, &QNetworkReply::uploadProgress, this, &CapeChange::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &CapeChange::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CapeChange::downloadError);
@@ -64,17 +62,18 @@ void CapeChange::setCape(QString& cape) {
connect(rep, &QNetworkReply::finished, this, &CapeChange::downloadFinished);
}
-void CapeChange::clearCape() {
+void CapeChange::clearCape()
+{
QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/capes/active"));
auto requestString = QString("{\"capeId\":\"%1\"}").arg(m_capeId);
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_token).toLocal8Bit());
- QNetworkReply *rep = APPLICATION->network()->deleteResource(request);
+ QNetworkReply* rep = APPLICATION->network()->deleteResource(request);
setStatus(tr("Removing cape"));
m_reply = shared_qobject_ptr<QNetworkReply>(rep);
connect(rep, &QNetworkReply::uploadProgress, this, &CapeChange::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &CapeChange::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &CapeChange::downloadError);
@@ -83,13 +82,11 @@ void CapeChange::clearCape() {
connect(rep, &QNetworkReply::finished, this, &CapeChange::downloadFinished);
}
-
void CapeChange::executeTask()
{
- if(m_capeId.isEmpty()) {
+ if (m_capeId.isEmpty()) {
clearCape();
- }
- else {
+ } else {
setCape(m_capeId);
}
}
@@ -115,8 +112,7 @@ void CapeChange::sslErrors(const QList<QSslError>& errors)
void CapeChange::downloadFinished()
{
// if the download failed
- if (m_reply->error() != QNetworkReply::NetworkError::NoError)
- {
+ if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
m_reply.reset();
return;
diff --git a/launcher/minecraft/services/CapeChange.h b/launcher/minecraft/services/CapeChange.h
index 38069f90..d0c893c4 100644
--- a/launcher/minecraft/services/CapeChange.h
+++ b/launcher/minecraft/services/CapeChange.h
@@ -3,31 +3,29 @@
#include <QFile>
#include <QtNetwork/QtNetwork>
#include <memory>
-#include "tasks/Task.h"
#include "QObjectPtr.h"
+#include "tasks/Task.h"
-class CapeChange : public Task
-{
+class CapeChange : public Task {
Q_OBJECT
-public:
- CapeChange(QObject *parent, QString token, QString capeId);
+ public:
+ CapeChange(QObject* parent, QString token, QString capeId);
virtual ~CapeChange() {}
-private:
- void setCape(QString & cape);
+ private:
+ void setCape(QString& cape);
void clearCape();
-private:
+ private:
QString m_capeId;
QString m_token;
shared_qobject_ptr<QNetworkReply> m_reply;
-protected:
+ protected:
virtual void executeTask();
-public slots:
+ public slots:
void downloadError(QNetworkReply::NetworkError);
void sslErrors(const QList<QSslError>& errors);
void downloadFinished();
};
-
diff --git a/launcher/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp
index fbaaeacb..9e902069 100644
--- a/launcher/minecraft/services/SkinDelete.cpp
+++ b/launcher/minecraft/services/SkinDelete.cpp
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -35,26 +35,23 @@
#include "SkinDelete.h"
-#include <QNetworkRequest>
#include <QHttpMultiPart>
+#include <QNetworkRequest>
#include "Application.h"
-SkinDelete::SkinDelete(QObject *parent, QString token)
- : Task(parent), m_token(token)
-{
-}
+SkinDelete::SkinDelete(QObject* parent, QString token) : Task(parent), m_token(token) {}
void SkinDelete::executeTask()
{
QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/skins/active"));
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_token).toLocal8Bit());
- QNetworkReply *rep = APPLICATION->network()->deleteResource(request);
+ QNetworkReply* rep = APPLICATION->network()->deleteResource(request);
m_reply = shared_qobject_ptr<QNetworkReply>(rep);
setStatus(tr("Deleting skin"));
connect(rep, &QNetworkReply::uploadProgress, this, &SkinDelete::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &SkinDelete::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &SkinDelete::downloadError);
@@ -84,12 +81,10 @@ void SkinDelete::sslErrors(const QList<QSslError>& errors)
void SkinDelete::downloadFinished()
{
// if the download failed
- if (m_reply->error() != QNetworkReply::NetworkError::NoError)
- {
+ if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
m_reply.reset();
return;
}
emitSucceeded();
}
-
diff --git a/launcher/minecraft/services/SkinDelete.h b/launcher/minecraft/services/SkinDelete.h
index b9a1c9d3..d5b2e63d 100644
--- a/launcher/minecraft/services/SkinDelete.h
+++ b/launcher/minecraft/services/SkinDelete.h
@@ -6,21 +6,20 @@
typedef shared_qobject_ptr<class SkinDelete> SkinDeletePtr;
-class SkinDelete : public Task
-{
+class SkinDelete : public Task {
Q_OBJECT
-public:
- SkinDelete(QObject *parent, QString token);
+ public:
+ SkinDelete(QObject* parent, QString token);
virtual ~SkinDelete() = default;
-private:
+ private:
QString m_token;
shared_qobject_ptr<QNetworkReply> m_reply;
-protected:
+ protected:
virtual void executeTask();
-public slots:
+ public slots:
void downloadError(QNetworkReply::NetworkError);
void sslErrors(const QList<QSslError>& errors);
void downloadFinished();
diff --git a/launcher/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp
index 711f8739..163b481b 100644
--- a/launcher/minecraft/services/SkinUpload.cpp
+++ b/launcher/minecraft/services/SkinUpload.cpp
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
- * PolyMC - Minecraft Launcher
+ * Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -35,12 +35,13 @@
#include "SkinUpload.h"
-#include <QNetworkRequest>
#include <QHttpMultiPart>
+#include <QNetworkRequest>
#include "Application.h"
-QByteArray getVariant(SkinUpload::Model model) {
+QByteArray getVariant(SkinUpload::Model model)
+{
switch (model) {
default:
qDebug() << "Unknown skin type!";
@@ -51,16 +52,15 @@ QByteArray getVariant(SkinUpload::Model model) {
}
}
-SkinUpload::SkinUpload(QObject *parent, QString token, QByteArray skin, SkinUpload::Model model)
+SkinUpload::SkinUpload(QObject* parent, QString token, QByteArray skin, SkinUpload::Model model)
: Task(parent), m_model(model), m_skin(skin), m_token(token)
-{
-}
+{}
void SkinUpload::executeTask()
{
QNetworkRequest request(QUrl("https://api.minecraftservices.com/minecraft/profile/skins"));
request.setRawHeader("Authorization", QString("Bearer %1").arg(m_token).toLocal8Bit());
- QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+ QHttpMultiPart* multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
QHttpPart skin;
skin.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/png"));
@@ -74,12 +74,12 @@ void SkinUpload::executeTask()
multiPart->append(skin);
multiPart->append(model);
- QNetworkReply *rep = APPLICATION->network()->post(request, multiPart);
+ QNetworkReply* rep = APPLICATION->network()->post(request, multiPart);
m_reply = shared_qobject_ptr<QNetworkReply>(rep);
setStatus(tr("Uploading skin"));
connect(rep, &QNetworkReply::uploadProgress, this, &SkinUpload::setProgress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &SkinUpload::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &SkinUpload::downloadError);
@@ -109,8 +109,7 @@ void SkinUpload::sslErrors(const QList<QSslError>& errors)
void SkinUpload::downloadFinished()
{
// if the download failed
- if (m_reply->error() != QNetworkReply::NetworkError::NoError)
- {
+ if (m_reply->error() != QNetworkReply::NetworkError::NoError) {
emitFailed(QString("Network error: %1").arg(m_reply->errorString()));
m_reply.reset();
return;
diff --git a/launcher/minecraft/services/SkinUpload.h b/launcher/minecraft/services/SkinUpload.h
index ac8c5b36..5716aa99 100644
--- a/launcher/minecraft/services/SkinUpload.h
+++ b/launcher/minecraft/services/SkinUpload.h
@@ -7,29 +7,25 @@
typedef shared_qobject_ptr<class SkinUpload> SkinUploadPtr;
-class SkinUpload : public Task
-{
+class SkinUpload : public Task {
Q_OBJECT
-public:
- enum Model
- {
- STEVE,
- ALEX
- };
+ public:
+ enum Model { STEVE, ALEX };
// Note this class takes ownership of the file.
- SkinUpload(QObject *parent, QString token, QByteArray skin, Model model = STEVE);
+ SkinUpload(QObject* parent, QString token, QByteArray skin, Model model = STEVE);
virtual ~SkinUpload() {}
-private:
+ private:
Model m_model;
QByteArray m_skin;
QString m_token;
shared_qobject_ptr<QNetworkReply> m_reply;
-protected:
+
+ protected:
virtual void executeTask();
-public slots:
+ public slots:
void downloadError(QNetworkReply::NetworkError);
void sslErrors(const QList<QSslError>& errors);
generated by cgit (git 2.46.0) at 2025-02-04 03:54:33 +0000