refactor: move NetJob away from ModModel to ModAPI

This is done so that 1. ModAPI behaves more like an actual API instead
of just a helper, and 2. Allows for more easily creating other mod
providers that may or may not use network tasks (foreshadowing lol)

4 files changed, 9 insertions, 25 deletions

diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index dc3d1469..784b1128 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -10,19 +10,10 @@ ListModel::ListModel(ModrinthPage* parent) : ModPlatform::ListModel(parent) {}
 
 ListModel::~ListModel() {}
 
-void Modrinth::ListModel::searchRequestFinished()
+void Modrinth::ListModel::searchRequestFinished(QJsonDocument& doc)
 {
     jobPtr.reset();
-
-    QJsonParseError parse_error;
-    QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
-    if (parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from Modrinth at " << parse_error.offset
-                   << " reason: " << parse_error.errorString();
-        qWarning() << response;
-        return;
-    }
-
+    
     QList<ModPlatform::IndexedPack> newList;
     auto packs = doc.object().value("hits").toArray();
     for (auto packRaw : packs) {
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
index b8937b50..d095b18c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.h
@@ -29,8 +29,8 @@ class ListModel : public ModPlatform::ListModel {
     ListModel(ModrinthPage* parent);
     virtual ~ListModel();
 
-   private slots:
-    void searchRequestFinished() override;
+   public slots:
+    void searchRequestFinished(QJsonDocument& doc) override;
 
    private:
     const char** getSorts() const override;
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 944f8afb..fa703e38 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -35,22 +35,15 @@ ModrinthPage::ModrinthPage(ModDownloadDialog* dialog, BaseInstance* instance)
 
 bool ModrinthPage::shouldDisplay() const { return true; }
 
-void ModrinthPage::onRequestVersionsSucceeded(ModPage* instance, QByteArray* response, QString addonId)
+void ModrinthPage::onRequestVersionsSucceeded(QJsonDocument& response, QString addonId)
 {
     if (addonId != current.addonId) { return; }
-    QJsonParseError parse_error;
-    QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
-    if (parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from Modrinth at " << parse_error.offset
-                   << " reason: " << parse_error.errorString();
-        qWarning() << *response;
-        return;
-    }
-    QJsonArray arr = doc.array();
+    
+    QJsonArray arr = response.array();
     try {
         Modrinth::loadIndexedPackVersions(current, arr, APPLICATION->network(), m_instance);
     } catch (const JSONValidationError& e) {
-        qDebug() << *response;
+        qDebug() << response;
         qWarning() << "Error while reading Modrinth mod version: " << e.cause();
     }
     auto packProfile = ((MinecraftInstance*)m_instance)->getPackProfile();
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
index 7b1d0a00..f6d1eef0 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h
@@ -22,5 +22,5 @@ class ModrinthPage : public ModPage {
     bool shouldDisplay() const override;
 
    private:
-    void onRequestVersionsSucceeded(ModPage*, QByteArray*, QString) override;
+    void onRequestVersionsSucceeded(QJsonDocument&, QString) override;
 };