fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt 6 - Fix http status response (#3983)

Browse Source 
* Fix http status response

* Use QStringLiteral
This commit is contained in:
El Thoro
2025-06-09 02:48:28 +02:00
committed by GitHub
parent aa11f4363c
commit 669dfaadea
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/imgupload/storages/imgur/imguruploader.cpp
View File

@@ -9,6 +9,7 @@
#include "src/widgets/notificationwidget.h" #include "src/widgets/notificationwidget.h"
#include <QBuffer> #include <QBuffer>
#include <QDesktopServices> #include <QDesktopServices>
#include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
@@ -31,9 +32,9 @@ void ImgurUploader::handleReply(QNetworkReply* reply)
{ {
spinner()->deleteLater(); spinner()->deleteLater();
m_currentImageName.clear(); m_currentImageName.clear();
QJsonDocument response = QJsonDocument::fromJson(reply->readAll());
QJsonObject json = response.object();
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
QJsonDocument response = QJsonDocument::fromJson(reply->readAll());
QJsonObject json = response.object();
QJsonObject data = json[QStringLiteral("data")].toObject(); QJsonObject data = json[QStringLiteral("data")].toObject();
setImageURL(data[QStringLiteral("link")].toString()); setImageURL(data[QStringLiteral("link")].toString());
@@ -54,7 +55,20 @@ void ImgurUploader::handleReply(QNetworkReply* reply)
emit uploadOk(imageURL()); emit uploadOk(imageURL());
} else { } else {
setInfoLabelText(reply->errorString()); QString status;
if (json.contains(QStringLiteral("errors")) &&
json.value(QStringLiteral("errors")).isArray()) {
QJsonArray errorsArray =
json.value(QStringLiteral("errors")).toArray();
if (!errorsArray.isEmpty() && errorsArray.at(0).isObject()) {
QJsonObject errorObj = errorsArray.at(0).toObject();
status = errorObj.value(QStringLiteral("code")).toString() +
" - " +
errorObj.value(QStringLiteral("status")).toString();
}
}
setInfoLabelText(reply->errorString() + "\n" + status);
} }
new QShortcut(Qt::Key_Escape, this, SLOT(close())); new QShortcut(Qt::Key_Escape, this, SLOT(close()));
} }