Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

1 files changed, 15 insertions, 20 deletions

diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index a50f9afa..29499a20 100644
--- a/launcher/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -35,17 +35,17 @@
  */
 
 #include "ImgurUpload.h"
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
-#include <QNetworkRequest>
+#include <QDebug>
+#include <QFile>
 #include <QHttpMultiPart>
+#include <QHttpPart>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QHttpPart>
-#include <QFile>
+#include <QNetworkRequest>
 #include <QUrl>
-#include <QDebug>
 
 ImgurUpload::ImgurUpload(ScreenShot::Ptr shot) : NetAction(), m_shot(shot)
 {
@@ -63,13 +63,12 @@ void ImgurUpload::executeTask()
     request.setRawHeader("Accept", "application/json");
 
     QFile f(m_shot->m_file.absoluteFilePath());
-    if (!f.open(QFile::ReadOnly))
-    {
+    if (!f.open(QFile::ReadOnly)) {
         emitFailed();
         return;
     }
 
-    QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+    QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
     QHttpPart filePart;
     filePart.setBody(f.readAll().toBase64());
     filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
@@ -84,12 +83,12 @@ void ImgurUpload::executeTask()
     namePart.setBody(m_shot->m_file.baseName().toUtf8());
     multipart->append(namePart);
 
-    QNetworkReply *rep = m_network->post(request, multipart);
+    QNetworkReply* rep = m_network->post(request, multipart);
 
     m_reply.reset(rep);
     connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress);
     connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished);
-#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, &ImgurUpload::downloadError);
 #else
     connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &ImgurUpload::downloadError);
@@ -97,11 +96,10 @@ void ImgurUpload::executeTask()
     connect(rep, &QNetworkReply::sslErrors, this, &ImgurUpload::sslErrors);
 }
 
-void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
+void ImgurUpload::downloadError([[maybe_unused]] QNetworkReply::NetworkError error)
 {
     qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
-    if(finished)
-    {
+    if (finished) {
         qCritical() << "Double finished ImgurUpload!";
         return;
     }
@@ -113,8 +111,7 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
 
 void ImgurUpload::downloadFinished()
 {
-    if(finished)
-    {
+    if (finished) {
         qCritical() << "Double finished ImgurUpload!";
         return;
     }
@@ -122,8 +119,7 @@ void ImgurUpload::downloadFinished()
     m_reply.reset();
     QJsonParseError jsonError;
     QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
-    if (jsonError.error != QJsonParseError::NoError)
-    {
+    if (jsonError.error != QJsonParseError::NoError) {
         qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
         finished = true;
         m_reply.reset();
@@ -131,8 +127,7 @@ void ImgurUpload::downloadFinished()
         return;
     }
     auto object = doc.object();
-    if (!object.value("success").toBool())
-    {
+    if (!object.value("success").toBool()) {
         qDebug() << "Screenshot upload not successful:" << doc.toJson();
         finished = true;
         m_reply.reset();