1 files changed, 24 insertions, 19 deletions

diff --git a/api/logic/net/PasteUpload.cpp b/api/logic/net/PasteUpload.cpp
index 59779b2c..d1ddf39d 100644
--- a/api/logic/net/PasteUpload.cpp
+++ b/api/logic/net/PasteUpload.cpp
@@ -2,41 +2,45 @@
 #include "Env.h"
 #include <QDebug>
 #include <QJsonObject>
+#include <QJsonArray>
 #include <QJsonDocument>
+#include <QFile>
 
 PasteUpload::PasteUpload(QWidget *window, QString text, QString key) : m_window(window)
 {
 	m_key = key;
 	QByteArray temp;
-	temp = text.toUtf8();
-	temp.replace('\n', "\r\n");
-	m_textSize = temp.size();
-	m_text = "key=" + m_key.toLatin1() + "&description=MultiMC5+Log+File&language=plain&format=json&expire=2592000&paste=" + temp.toPercentEncoding();
-	buf =  new QBuffer(&m_text);
+	QJsonObject topLevelObj;
+	QJsonObject sectionObject;
+	sectionObject.insert("contents", text);
+	QJsonArray sectionArray;
+	sectionArray.append(sectionObject);
+	topLevelObj.insert("description", "MultiMC Log Upload");
+	topLevelObj.insert("sections", sectionArray);
+	QJsonDocument docOut;
+	docOut.setObject(topLevelObj);
+	m_jsonContent = docOut.toJson();
 }
 
 PasteUpload::~PasteUpload()
 {
-	if(buf)
-	{
-		delete buf;
-	}
 }
 
 bool PasteUpload::validateText()
 {
-	return m_textSize <= maxSize();
+	return m_jsonContent.size() <= maxSize();
 }
 
 void PasteUpload::executeTask()
 {
-	QNetworkRequest request(QUrl("https://paste.ee/api"));
+	QNetworkRequest request(QUrl("https://api.paste.ee/v1/pastes"));
 	request.setHeader(QNetworkRequest::UserAgentHeader, "MultiMC/5.0 (Uncached)");
 
-	request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
-	request.setRawHeader("Content-Length", QByteArray::number(m_text.size()));
+	request.setRawHeader("Content-Type", "application/json");
+	request.setRawHeader("Content-Length", QByteArray::number(m_jsonContent.size()));
+	request.setRawHeader("X-Auth-Token", m_key.toStdString().c_str());
 
-	QNetworkReply *rep = ENV.qnam().post(request, buf);
+	QNetworkReply *rep = ENV.qnam().post(request, m_jsonContent);
 
 	m_reply = std::shared_ptr<QNetworkReply>(rep);
 	setStatus(tr("Uploading to paste.ee"));
@@ -54,10 +58,10 @@ void PasteUpload::downloadError(QNetworkReply::NetworkError error)
 
 void PasteUpload::downloadFinished()
 {
+	QByteArray data = m_reply->readAll();
 	// if the download succeeded
 	if (m_reply->error() == QNetworkReply::NetworkError::NoError)
 	{
-		QByteArray data = m_reply->readAll();
 		m_reply.reset();
 		QJsonParseError jsonError;
 		QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
@@ -85,14 +89,15 @@ void PasteUpload::downloadFinished()
 bool PasteUpload::parseResult(QJsonDocument doc)
 {
 	auto object = doc.object();
-	auto status = object.value("status").toString("error");
-	if (status == "error")
+	auto status = object.value("success").toBool();
+	if (!status)
 	{
 		qCritical() << "paste.ee reported error:" << QString(object.value("error").toString());
 		return false;
 	}
-	m_pasteLink = object.value("paste").toObject().value("link").toString();
-	m_pasteID = object.value("paste").toObject().value("id").toString();
+	m_pasteLink = object.value("link").toString();
+	m_pasteID = object.value("id").toString();
+	qDebug() << m_pasteLink;
 	return true;
 }