From 6ec1cf6e4933013e04acb9086f3fcf4a844d181a Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Fri, 8 Sep 2023 19:50:46 +0300
Subject: [PATCH] made skin upload more generic

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/minecraft/skins/SkinUpload.cpp        | 10 +++++-----
 launcher/minecraft/skins/SkinUpload.h          |  8 ++++----
 launcher/ui/dialogs/skins/SkinManageDialog.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/launcher/minecraft/skins/SkinUpload.cpp b/launcher/minecraft/skins/SkinUpload.cpp
index 4496f3f1c..4a88faedf 100644
--- a/launcher/minecraft/skins/SkinUpload.cpp
+++ b/launcher/minecraft/skins/SkinUpload.cpp
@@ -42,7 +42,7 @@
 #include "net/ByteArraySink.h"
 #include "net/StaticHeaderProxy.h"
 
-SkinUpload::SkinUpload(QString token, SkinModel* skin) : NetRequest(), m_skin(skin), m_token(token)
+SkinUpload::SkinUpload(QString token, QString path, QString variant) : NetRequest(), m_token(token), m_path(path), m_variant(variant)
 {
     logCat = taskMCSkinsLogC;
 }
@@ -55,11 +55,11 @@ QNetworkReply* SkinUpload::getReply(QNetworkRequest& request)
     skin.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/png"));
     skin.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"file\"; filename=\"skin.png\""));
 
-    skin.setBody(FS::read(m_skin->getPath()));
+    skin.setBody(FS::read(m_path));
 
     QHttpPart model;
     model.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"variant\""));
-    model.setBody(m_skin->getModelString().toUtf8());
+    model.setBody(m_variant.toUtf8());
 
     multiPart->append(skin);
     multiPart->append(model);
@@ -74,9 +74,9 @@ void SkinUpload::init()
     }));
 }
 
-SkinUpload::Ptr SkinUpload::make(QString token, SkinModel* skin)
+SkinUpload::Ptr SkinUpload::make(QString token, QString path, QString variant)
 {
-    auto up = makeShared<SkinUpload>(token, skin);
+    auto up = makeShared<SkinUpload>(token, path, variant);
     up->m_url = QUrl("https://api.minecraftservices.com/minecraft/profile/skins");
     up->setObjectName(QString("BYTES:") + up->m_url.toString());
     up->m_sink.reset(new Net::ByteArraySink(std::make_shared<QByteArray>()));
diff --git a/launcher/minecraft/skins/SkinUpload.h b/launcher/minecraft/skins/SkinUpload.h
index d070f301d..f24cef5a2 100644
--- a/launcher/minecraft/skins/SkinUpload.h
+++ b/launcher/minecraft/skins/SkinUpload.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "minecraft/skins/SkinModel.h"
 #include "net/NetRequest.h"
 
 class SkinUpload : public Net::NetRequest {
@@ -27,16 +26,17 @@ class SkinUpload : public Net::NetRequest {
     using Ptr = shared_qobject_ptr<SkinUpload>;
 
     // Note this class takes ownership of the file.
-    SkinUpload(QString token, SkinModel* skin);
+    SkinUpload(QString token, QString path, QString variant);
     virtual ~SkinUpload() = default;
 
-    static SkinUpload::Ptr make(QString token, SkinModel* skin);
+    static SkinUpload::Ptr make(QString token, QString path, QString variant);
     void init() override;
 
    protected:
     virtual QNetworkReply* getReply(QNetworkRequest&) override;
 
    private:
-    SkinModel* m_skin;
     QString m_token;
+    QString m_path;
+    QString m_variant;
 };
diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.cpp b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
index 4ef91a2bf..24197baeb 100644
--- a/launcher/ui/dialogs/skins/SkinManageDialog.cpp
+++ b/launcher/ui/dialogs/skins/SkinManageDialog.cpp
@@ -242,7 +242,7 @@ void SkinManageDialog::accept()
         return;
     }
 
-    skinUpload->addNetAction(SkinUpload::make(m_acct->accessToken(), skin));
+    skinUpload->addNetAction(SkinUpload::make(m_acct->accessToken(), skin->getPath(), skin->getModelString()));
 
     auto selectedCape = skin->getCapeId();
     if (selectedCape != m_acct->accountData()->minecraftProfile.currentCape) {