From 6f052baa94f6f758cb18b81e2cf5e28cdc5bd367 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Mon, 18 Jul 2022 19:22:31 -0300
Subject: [PATCH] refactor: use function cb instead of class cb in getVersions

I've discovered even more functional programming! :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/ModAPI.h                  |  2 +-
 launcher/modplatform/helpers/NetworkModAPI.cpp | 12 ++++++------
 launcher/modplatform/helpers/NetworkModAPI.h   |  2 +-
 launcher/ui/pages/modplatform/ModModel.cpp     |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/launcher/modplatform/ModAPI.h b/launcher/modplatform/ModAPI.h
index 999a0552..c7408835 100644
--- a/launcher/modplatform/ModAPI.h
+++ b/launcher/modplatform/ModAPI.h
@@ -85,7 +85,7 @@ class ModAPI {
         ModLoaderTypes loaders;
     };
 
-    virtual void getVersions(CallerType* caller, VersionSearchArgs&& args) const = 0;
+    virtual void getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const = 0;
 
     static auto getModLoaderString(ModLoaderType type) -> const QString {
         switch (type) {
diff --git a/launcher/modplatform/helpers/NetworkModAPI.cpp b/launcher/modplatform/helpers/NetworkModAPI.cpp
index 36e11217..866e7540 100644
--- a/launcher/modplatform/helpers/NetworkModAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkModAPI.cpp
@@ -52,27 +52,27 @@ void NetworkModAPI::getModInfo(ModPlatform::IndexedPack& pack, std::function<voi
     job->start();
 }
 
-void NetworkModAPI::getVersions(CallerType* caller, VersionSearchArgs&& args) const
+void NetworkModAPI::getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const
 {
-    auto netJob = new NetJob(QString("%1::ModVersions(%2)").arg(caller->debugName()).arg(args.addonId), APPLICATION->network());
+    auto netJob = new NetJob(QString("ModVersions(%2)").arg(args.addonId), APPLICATION->network());
     auto response = new QByteArray();
 
     netJob->addNetAction(Net::Download::makeByteArray(getVersionsURL(args), response));
 
-    QObject::connect(netJob, &NetJob::succeeded, caller, [response, caller, args] {
+    QObject::connect(netJob, &NetJob::succeeded, [response, callback, args] {
         QJsonParseError parse_error{};
         QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
         if (parse_error.error != QJsonParseError::NoError) {
-            qWarning() << "Error while parsing JSON response from " << caller->debugName() << " at " << parse_error.offset
+            qWarning() << "Error while parsing JSON response for getting versions at " << parse_error.offset
                        << " reason: " << parse_error.errorString();
             qWarning() << *response;
             return;
         }
 
-        caller->versionRequestSucceeded(doc, args.addonId);
+        callback(doc, args.addonId);
     });
 
-    QObject::connect(netJob, &NetJob::finished, caller, [response, netJob] {
+    QObject::connect(netJob, &NetJob::finished, [response, netJob] {
         netJob->deleteLater();
         delete response;
     });
diff --git a/launcher/modplatform/helpers/NetworkModAPI.h b/launcher/modplatform/helpers/NetworkModAPI.h
index 364fbb8a..b8af22c7 100644
--- a/launcher/modplatform/helpers/NetworkModAPI.h
+++ b/launcher/modplatform/helpers/NetworkModAPI.h
@@ -6,7 +6,7 @@ class NetworkModAPI : public ModAPI {
    public:
     void searchMods(CallerType* caller, SearchArgs&& args) const override;
     void getModInfo(ModPlatform::IndexedPack& pack, std::function<void(QJsonDocument&, ModPlatform::IndexedPack&)> callback) override;
-    void getVersions(CallerType* caller, VersionSearchArgs&& args) const override;
+    void getVersions(VersionSearchArgs&& args, std::function<void(QJsonDocument&, QString)> callback) const override;
 
     auto getProject(QString addonId, QByteArray* response) const -> NetJob* override;
 
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index 13cfc9cb..f3e1e6ae 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -100,7 +100,8 @@ void ListModel::requestModVersions(ModPlatform::IndexedPack const& current)
 {
     auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
 
-    m_parent->apiProvider()->getVersions(this, { current.addonId.toString(), getMineVersions(), profile->getModLoaders() });
+    m_parent->apiProvider()->getVersions({ current.addonId.toString(), getMineVersions(), profile->getModLoaders() },
+                                         [this, current](QJsonDocument& doc, QString addonId) { versionRequestSucceeded(doc, addonId); });
 }
 
 void ListModel::performPaginatedSearch()