adopt changes from #497 remapped

CMakeLists.txt

@@ -89,6 +89,10 @@ set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can g
 # MSA Client ID
 set(Launcher_MSA_CLIENT_ID "549033b2-1532-4d4e-ae77-1bbaa46f9d74" CACHE STRING "Client ID you can get from Microsoft Identity Platform when you register an application")
 
+# CurseForge API Key
+# CHANGE THIS IF YOU FORK THIS PROJECT!
+set(Launcher_CURSEFORGE_API_KEY "$2a$10$iR1RdPDG95FWdILZbHuoMOlV4vL4eckBx7QPZR6SVZmliEb9ZQplu" CACHE STRING "CurseForge API Key")
+
 # Bug tracker URL
 set(Launcher_BUG_TRACKER_URL "https://github.com/PolyMC/PolyMC/issues" CACHE STRING "URL for the bug tracker.")
 

buildconfig/BuildConfig.cpp.in

@@ -90,6 +90,7 @@ Config::Config()
     HELP_URL = "@Launcher_HELP_URL@";
     IMGUR_CLIENT_ID = "@Launcher_IMGUR_CLIENT_ID@";
     MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@";
+    CURSEFORGE_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
 
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";

buildconfig/BuildConfig.h

@@ -39,8 +39,7 @@
 /**
  * \brief The Config class holds all the build-time information passed from the build system.
  */
-class Config
+class Config {
-{
    public:
     Config();
     QString LAUNCHER_NAME;
@@ -74,7 +73,6 @@ public:
     /// URL for the updater's channel
     QString UPDATER_BASE;
 
-
     /// User-Agent to use.
     QString USER_AGENT;
 
@@ -116,6 +114,11 @@ public:
      */
     QString MSA_CLIENT_ID;
 
+    /**
+     * Client API key for CurseForge
+     */
+    QString CURSEFORGE_API_KEY;
+
     /**
      * Metadata repository URL prefix
      */
@@ -154,4 +157,3 @@ public:
 };
 
 extern const Config BuildConfig;
-

launcher/modplatform/flame/FileResolvingTask.cpp

@@ -1,14 +1,9 @@
 #include "FileResolvingTask.h"
 #include "Json.h"
 
-namespace {
-    const char * metabase = "https://cursemeta.dries007.net";
-}
-
 Flame::FileResolvingTask::FileResolvingTask(shared_qobject_ptr<QNetworkAccessManager> network, Flame::Manifest& toProcess)
     : m_network(network), m_toProcess(toProcess)
-{
+{}
-}
 
 void Flame::FileResolvingTask::executeTask()
 {
@@ -17,11 +12,10 @@ void Flame::FileResolvingTask::executeTask()
     m_dljob = new NetJob("Mod id resolver", m_network);
     results.resize(m_toProcess.files.size());
     int index = 0;
-    for(auto & file: m_toProcess.files)
+    for (auto& file : m_toProcess.files) {
-    {
         auto projectIdStr = QString::number(file.projectId);
         auto fileIdStr = QString::number(file.fileId);
-        QString metaurl = QString("%1/%2/%3.json").arg(metabase, projectIdStr, fileIdStr);
+        QString metaurl = QString("https://api.curseforge.com/v1/mods/%1/files/%2").arg(projectIdStr, fileIdStr);
         auto dl = Net::Download::makeByteArray(QUrl(metaurl), &results[index]);
         m_dljob->addNetAction(dl);
         index++;
@@ -34,16 +28,11 @@ void Flame::FileResolvingTask::netJobFinished()
 {
     bool failed = false;
     int index = 0;
-    for(auto & bytes: results)
+    for (auto& bytes : results) {
-    {
         auto& out = m_toProcess.files[index];
-        try
+        try {
-        {
             failed &= (!out.parseFromBytes(bytes));
-        }
+        } catch (const JSONValidationError& e) {
-        catch (const JSONValidationError &e)
-        {
-
             qCritical() << "Resolving of" << out.projectId << out.fileId << "failed because of a parsing error:";
             qCritical() << e.cause();
             qCritical() << "JSON:";
@@ -52,12 +41,9 @@ void Flame::FileResolvingTask::netJobFinished()
         }
         index++;
     }
-    if(!failed)
+    if (!failed) {
-    {
         emitSucceeded();
-    }
+    } else {
-    else
-    {
         emitFailed(tr("Some mod ID resolving tasks failed."));
     }
 }

launcher/modplatform/flame/FlameAPI.h

@@ -3,33 +3,53 @@
 #include "modplatform/helpers/NetworkModAPI.h"
 
 class FlameAPI : public NetworkModAPI {
+   private:
+    inline auto getSortFieldInt(QString sortString) const -> int
+    {
+        return sortString == "Featured"         ? 1
+               : sortString == "Popularity"     ? 2
+               : sortString == "LastUpdated"    ? 3
+               : sortString == "Name"           ? 4
+               : sortString == "Author"         ? 5
+               : sortString == "TotalDownloads" ? 6
+               : sortString == "Category"       ? 7
+               : sortString == "GameVersion"    ? 8
+                                                : 1;
+    }
+
    private:
     inline auto getModSearchURL(SearchArgs& args) const -> QString override
     {
         auto gameVersionStr = args.versions.size() != 0 ? QString("gameVersion=%1").arg(args.versions.front().toString()) : QString();
 
         return QString(
-                   "https://addons-ecs.forgesvc.net/api/v2/addon/search?"
+                   "https://api.curseforge.com/v1/mods/search?"
                    "gameId=432&"
-                   "categoryId=0&"
+                   "classId=6&"
-                   "sectionId=6&"
 
                    "index=%1&"
                    "pageSize=25&"
                    "searchFilter=%2&"
-                   "sort=%3&"
+                   "sortField=%3&"
+                   "sortOrder=desc&"
                    "modLoaderType=%4&"
                    "%5")
             .arg(args.offset)
             .arg(args.search)
-            .arg(args.sorting)
+            .arg(getSortFieldInt(args.sorting))
             .arg(getMappedModLoader(args.mod_loader))
             .arg(gameVersionStr);
     };
 
     inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
     {
-        return QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(args.addonId);
+        QString gameVersionQuery = args.mcVersions.size() == 1 ? QString("gameVersion=%1&").arg(args.mcVersions.front().toString()) : "";
+        QString modLoaderQuery = QString("modLoaderType=%1&").arg(getMappedModLoader(args.loader));
+
+        return QString("https://api.curseforge.com/v1/mods/%1/files?pageSize=10000&%2%3")
+            .arg(args.addonId)
+            .arg(gameVersionQuery)
+            .arg(modLoaderQuery);
     };
 
    public:

launcher/modplatform/flame/FlameModIndex.cpp

@@ -10,23 +10,12 @@ void FlameMod::loadIndexedPack(ModPlatform::IndexedPack& pack, QJsonObject& obj)
 {
     pack.addonId = Json::requireInteger(obj, "id");
     pack.name = Json::requireString(obj, "name");
-    pack.websiteUrl = Json::ensureString(obj, "websiteUrl", "");
+    pack.websiteUrl = Json::ensureString(Json::ensureObject(obj, "links"), "websiteUrl", "");
     pack.description = Json::ensureString(obj, "summary", "");
 
-    bool thumbnailFound = false;
+    QJsonObject logo = Json::requireObject(obj, "logo");
-    auto attachments = Json::requireArray(obj, "attachments");
+    pack.logoName = Json::requireString(logo, "title");
-    for (auto attachmentRaw : attachments) {
+    pack.logoUrl = Json::requireString(logo, "thumbnailUrl");
-        auto attachmentObj = Json::requireObject(attachmentRaw);
-        bool isDefault = attachmentObj.value("isDefault").toBool(false);
-        if (isDefault) {
-            thumbnailFound = true;
-            pack.logoName = Json::requireString(attachmentObj, "title");
-            pack.logoUrl = Json::requireString(attachmentObj, "thumbnailUrl");
-            break;
-        }
-    }
-
-    if (!thumbnailFound) { throw JSONValidationError(QString("Pack without an icon, skipping: %1").arg(pack.name)); }
 
     auto authors = Json::requireArray(obj, "authors");
     for (auto authorIter : authors) {
@@ -45,17 +34,21 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
     auto profile = (dynamic_cast<MinecraftInstance*>(inst))->getPackProfile();
-    bool hasFabric = FlameAPI::getMappedModLoader(profile->getModLoader()) == ModAPI::Fabric;
     QString mcVersion = profile->getComponentVersion("net.minecraft");
 
     for (auto versionIter : arr) {
         auto obj = versionIter.toObject();
 
-        auto versionArray = Json::requireArray(obj, "gameVersion");
+        auto versionArray = Json::requireArray(obj, "gameVersions");
-        if (versionArray.isEmpty()) { continue; }
+        if (versionArray.isEmpty()) {
+            continue;
+        }
 
         ModPlatform::IndexedVersion file;
         for (auto mcVer : versionArray) {
+            auto str = mcVer.toString();
+
+            if (str.indexOf('.') > -1)
                 file.mcVersion.append(mcVer.toString());
         }
 
@@ -66,28 +59,9 @@ void FlameMod::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
         file.downloadUrl = Json::requireString(obj, "downloadUrl");
         file.fileName = Json::requireString(obj, "fileName");
 
-        auto modules = Json::requireArray(obj, "modules");
-        bool is_valid_fabric_version = false;
-        for (auto m : modules) {
-            auto fname = Json::requireString(m.toObject(), "foldername");
-            // FIXME: This does not work properly when a mod supports more than one mod loader, since
-            // FIXME: This also doesn't deal with Quilt mods at the moment
-            // they bundle the meta files for all of them in the same arquive, even when that version
-            // doesn't support the given mod loader.
-            if (hasFabric) {
-                if (fname == "fabric.mod.json") {
-                    is_valid_fabric_version = true;
-                    break;
-                }
-            } else
-                break;
-            // NOTE: Since we're not validating forge versions, we can just skip this loop.
-        }
-
-        if (hasFabric && !is_valid_fabric_version) continue;
-
         unsortedVersions.append(file);
     }
+
     auto orderSortPredicate = [](const ModPlatform::IndexedVersion& a, const ModPlatform::IndexedVersion& b) -> bool {
         // dates are in RFC 3339 format
         return a.date > b.date;

launcher/modplatform/flame/FlamePackIndex.cpp

@@ -9,22 +9,9 @@ void Flame::loadIndexedPack(Flame::IndexedPack & pack, QJsonObject & obj)
     pack.websiteUrl = Json::ensureString(obj, "websiteUrl", "");
     pack.description = Json::ensureString(obj, "summary", "");
 
-    bool thumbnailFound = false;
+    auto logo = Json::requireObject(obj, "logo");
-    auto attachments = Json::requireArray(obj, "attachments");
+    pack.logoName = Json::requireString(logo, "title");
-    for(auto attachmentRaw: attachments) {
+    pack.logoUrl = Json::requireString(logo, "thumbnailUrl");
-        auto attachmentObj = Json::requireObject(attachmentRaw);
-        bool isDefault = attachmentObj.value("isDefault").toBool(false);
-        if(isDefault) {
-            thumbnailFound = true;
-            pack.logoName = Json::requireString(attachmentObj, "title");
-            pack.logoUrl = Json::requireString(attachmentObj, "thumbnailUrl");
-            break;
-        }
-    }
-
-    if(!thumbnailFound) {
-        throw JSONValidationError(QString("Pack without an icon, skipping: %1").arg(pack.name));
-    }
 
     auto authors = Json::requireArray(obj, "authors");
     for (auto authorIter : authors) {
@@ -34,7 +21,7 @@ void Flame::loadIndexedPack(Flame::IndexedPack & pack, QJsonObject & obj)
         packAuthor.url = Json::requireString(author, "url");
         pack.authors.append(packAuthor);
     }
-    int defaultFileId = Json::requireInteger(obj, "defaultFileId");
+    int defaultFileId = Json::requireInteger(obj, "mainFileId");
 
     bool found = false;
     // check if there are some files before adding the pack
@@ -48,7 +35,7 @@ void Flame::loadIndexedPack(Flame::IndexedPack & pack, QJsonObject & obj)
             continue;
         }
 
-        auto versionArray = Json::requireArray(file, "gameVersion");
+        auto versionArray = Json::requireArray(file, "gameVersions");
         if (versionArray.size() < 1) {
             continue;
         }
@@ -70,7 +57,7 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack & pack, QJsonArray & arr)
 
         file.addonId = pack.addonId;
         file.fileId = Json::requireInteger(version, "id");
-        auto versionArray = Json::requireArray(version, "gameVersion");
+        auto versionArray = Json::requireArray(version, "gameVersions");
         if (versionArray.size() < 1) {
             continue;
         }
@@ -82,10 +69,7 @@ void Flame::loadIndexedPackVersions(Flame::IndexedPack & pack, QJsonArray & arr)
         unsortedVersions.append(file);
     }
 
-    auto orderSortPredicate = [](const IndexedVersion & a, const IndexedVersion & b) -> bool
+    auto orderSortPredicate = [](const IndexedVersion& a, const IndexedVersion& b) -> bool { return a.fileId > b.fileId; };
-    {
-        return a.fileId > b.fileId;
-    };
     std::sort(unsortedVersions.begin(), unsortedVersions.end(), orderSortPredicate);
     pack.versions = unsortedVersions;
     pack.versionsLoaded = true;

launcher/modplatform/flame/PackManifest.cpp

@@ -21,8 +21,7 @@ static void loadMinecraftV1(Flame::Minecraft & m, QJsonObject & minecraft)
     // intended use is likely hardcoded in the 'Flame' client, the manifest says nothing
     m.libraries = Json::ensureString(minecraft, QString("libraries"), QString());
     auto arr = Json::ensureArray(minecraft, "modLoaders", QJsonArray());
-    for (QJsonValueRef item : arr)
+    for (QJsonValueRef item : arr) {
-    {
         auto obj = Json::requireObject(item);
         Flame::Modloader loader;
         loadModloaderV1(loader, obj);
@@ -36,10 +35,9 @@ static void loadManifestV1(Flame::Manifest & m, QJsonObject & manifest)
     loadMinecraftV1(m.minecraft, mc);
     m.name = Json::ensureString(manifest, QString("name"), "Unnamed");
     m.version = Json::ensureString(manifest, QString("version"), QString());
-    m.author = Json::ensureString(manifest, QString("author"), "Anonymous Coward");
+    m.author = Json::ensureString(manifest, QString("author"), "Anonymous");
     auto arr = Json::ensureArray(manifest, "files", QJsonArray());
-    for (QJsonValueRef item : arr)
+    for (QJsonValueRef item : arr) {
-    {
         auto obj = Json::requireObject(item);
         Flame::File file;
         loadFileV1(file, obj);
@@ -53,13 +51,11 @@ void Flame::loadManifest(Flame::Manifest & m, const QString &filepath)
     auto doc = Json::requireDocument(filepath);
     auto obj = Json::requireObject(doc);
     m.manifestType = Json::requireString(obj, "manifestType");
-    if(m.manifestType != "minecraftModpack")
+    if (m.manifestType != "minecraftModpack") {
-    {
         throw JSONValidationError("Not a modpack manifest!");
     }
     m.manifestVersion = Json::requireInteger(obj, "manifestVersion");
-    if(m.manifestVersion != 1)
+    if (m.manifestVersion != 1) {
-    {
         throw JSONValidationError(QString("Unknown manifest version (%1)").arg(m.manifestVersion));
     }
     loadManifestV1(m, obj);
@@ -68,59 +64,30 @@ void Flame::loadManifest(Flame::Manifest & m, const QString &filepath)
 bool Flame::File::parseFromBytes(const QByteArray& bytes)
 {
     auto doc = Json::requireDocument(bytes);
-    auto obj = Json::requireObject(doc);
+    if (!doc.isObject()) {
-    // result code signifies true failure.
+        throw JSONValidationError(QString("data is not an object? that's not supposed to happen"));
-    if(obj.contains("code"))
-    {
-        qCritical() << "Resolving of" << projectId << fileId << "failed because of a negative result:";
-        qCritical() << bytes;
-        return false;
     }
-    fileName = Json::requireString(obj, "FileNameOnDisk");
+    auto obj = Json::ensureObject(doc.object(), "data");
-    QString rawUrl = Json::requireString(obj, "DownloadURL");
+
+    fileName = Json::requireString(obj, "fileName");
+
+    QString rawUrl = Json::requireString(obj, "downloadUrl");
     url = QUrl(rawUrl, QUrl::TolerantMode);
-    if(!url.isValid())
+    if (!url.isValid()) {
-    {
         throw JSONValidationError(QString("Invalid URL: %1").arg(rawUrl));
     }
     // This is a piece of a Flame project JSON pulled out into the file metadata (here) for convenience
     // It is also optional
-    QJsonObject projObj = Json::ensureObject(obj, "_Project", {});
-    if(!projObj.isEmpty())
-    {
-        QString strType = Json::ensureString(projObj, "PackageType", "mod").toLower();
-        if(strType == "singlefile")
-        {
     type = File::Type::SingleFile;
+
+    if (fileName.endsWith(".zip")) {
+        // this is probably a resource pack
+        targetFolder = "resourcepacks";
+    } else {
+        // this is probably a mod, dunno what else could modpacks download
+        targetFolder = "mods";
     }
-        else if(strType == "ctoc")
+
-        {
-            type = File::Type::Ctoc;
-        }
-        else if(strType == "cmod2")
-        {
-            type = File::Type::Cmod2;
-        }
-        else if(strType == "mod")
-        {
-            type = File::Type::Mod;
-        }
-        else if(strType == "folder")
-        {
-            type = File::Type::Folder;
-        }
-        else if(strType == "modpack")
-        {
-            type = File::Type::Modpack;
-        }
-        else
-        {
-            qCritical() << "Resolving of" << projectId << fileId << "failed because of unknown file type:" << strType;
-            type = File::Type::Unknown;
-            return false;
-        }
-        targetFolder = Json::ensureString(projObj, "Path", "mods");
-    }
     resolved = true;
     return true;
 }

launcher/net/Download.cpp

@@ -15,14 +15,14 @@
 
 #include "Download.h"
 
-#include <QFileInfo>
 #include <QDateTime>
 #include <QDebug>
+#include <QFileInfo>
 
-#include "FileSystem.h"
-#include "ChecksumValidator.h"
-#include "MetaCacheSink.h"
 #include "ByteArraySink.h"
+#include "ChecksumValidator.h"
+#include "FileSystem.h"
+#include "MetaCacheSink.h"
 
 #include "BuildConfig.h"
 
@@ -70,16 +70,14 @@ void Download::addValidator(Validator * v)
 
 void Download::startImpl()
 {
-    if(m_status == Job_Aborted)
+    if (m_status == Job_Aborted) {
-    {
         qWarning() << "Attempt to start an aborted Download:" << m_url.toString();
         emit aborted(m_index_within_job);
         return;
     }
     QNetworkRequest request(m_url);
     m_status = m_sink->init(request);
-    switch(m_status)
+    switch (m_status) {
-    {
         case Job_Finished:
             emit succeeded(m_index_within_job);
             qDebug() << "Download cache hit " << m_url.toString();
@@ -97,6 +95,9 @@ void Download::startImpl()
     }
 
     request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT);
+    if (request.url().host().contains("api.curseforge.com")) {
+        request.setRawHeader("x-api-key", BuildConfig.CURSEFORGE_API_KEY.toUtf8());
+    };
 
     QNetworkReply* rep = m_network->get(request);
 
@@ -117,17 +118,12 @@ void Download::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 
 void Download::downloadError(QNetworkReply::NetworkError error)
 {
-    if(error == QNetworkReply::OperationCanceledError)
+    if (error == QNetworkReply::OperationCanceledError) {
-    {
         qCritical() << "Aborted " << m_url.toString();
         m_status = Job_Aborted;
-    }
+    } else {
-    else
+        if (m_options & Option::AcceptLocalFiles) {
-    {
+            if (m_sink->hasLocalData()) {
-        if(m_options & Option::AcceptLocalFiles)
-        {
-            if(m_sink->hasLocalData())
-            {
                 m_status = Job_Failed_Proceed;
                 return;
             }
@@ -141,8 +137,7 @@ void Download::downloadError(QNetworkReply::NetworkError error)
 void Download::sslErrors(const QList<QSslError>& errors)
 {
     int i = 1;
-    for (auto error : errors)
+    for (auto error : errors) {
-    {
         qCritical() << "Download" << m_url.toString() << "SSL Error #" << i << " : " << error.errorString();
         auto cert = error.certificate();
         qCritical() << "Certificate in question:\n" << cert.toText();
@@ -153,33 +148,27 @@ void Download::sslErrors(const QList<QSslError> & errors)
 bool Download::handleRedirect()
 {
     QUrl redirect = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
-    if(!redirect.isValid())
+    if (!redirect.isValid()) {
-    {
+        if (!m_reply->hasRawHeader("Location")) {
-        if(!m_reply->hasRawHeader("Location"))
-        {
             // no redirect -> it's fine to continue
             return false;
         }
         // there is a Location header, but it's not correct. we need to apply some workarounds...
         QByteArray redirectBA = m_reply->rawHeader("Location");
-        if(redirectBA.size() == 0)
+        if (redirectBA.size() == 0) {
-        {
             // empty, yet present redirect header? WTF?
             return false;
         }
         QString redirectStr = QString::fromUtf8(redirectBA);
 
-        if(redirectStr.startsWith("//"))
+        if (redirectStr.startsWith("//")) {
-        {
             /*
              * IF the URL begins with //, we need to insert the URL scheme.
              * See: https://bugreports.qt.io/browse/QTBUG-41061
              * See: http://tools.ietf.org/html/rfc3986#section-4.2
              */
             redirectStr = m_reply->url().scheme() + ":" + redirectStr;
-        }
+        } else if (redirectStr.startsWith("/")) {
-        else if(redirectStr.startsWith("/"))
-        {
             /*
              * IF the URL begins with /, we need to process it as a relative URL
              */
@@ -193,16 +182,13 @@ bool Download::handleRedirect()
          * FIXME: report Qt bug for this
          */
         redirect = QUrl(redirectStr, QUrl::TolerantMode);
-        if(!redirect.isValid())
+        if (!redirect.isValid()) {
-        {
             qWarning() << "Failed to parse redirect URL:" << redirectStr;
             downloadError(QNetworkReply::ProtocolFailure);
             return false;
         }
         qDebug() << "Fixed location header:" << redirect;
-    }
+    } else {
-    else
-    {
         qDebug() << "Location header:" << redirect;
     }
 
@@ -212,35 +198,28 @@ bool Download::handleRedirect()
     return true;
 }
 
-
 void Download::downloadFinished()
 {
     // handle HTTP redirection first
-    if(handleRedirect())
+    if (handleRedirect()) {
-    {
         qDebug() << "Download redirected:" << m_url.toString();
         return;
     }
 
     // if the download failed before this point ...
-    if (m_status == Job_Failed_Proceed)
+    if (m_status == Job_Failed_Proceed) {
-    {
         qDebug() << "Download failed but we are allowed to proceed:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit succeeded(m_index_within_job);
         return;
-    }
+    } else if (m_status == Job_Failed) {
-    else if (m_status == Job_Failed)
-    {
         qDebug() << "Download failed in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
         emit failed(m_index_within_job);
         return;
-    }
+    } else if (m_status == Job_Aborted) {
-    else if(m_status == Job_Aborted)
-    {
         qDebug() << "Download aborted in previous step:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
@@ -250,16 +229,14 @@ void Download::downloadFinished()
 
     // make sure we got all the remaining data, if any
     auto data = m_reply->readAll();
-    if(data.size())
+    if (data.size()) {
-    {
         qDebug() << "Writing extra" << data.size() << "bytes to" << m_target_path;
         m_status = m_sink->write(data);
     }
 
     // otherwise, finalize the whole graph
     m_status = m_sink->finalize(*m_reply.get());
-    if (m_status != Job_Finished)
+    if (m_status != Job_Finished) {
-    {
         qDebug() << "Download failed to finalize:" << m_url.toString();
         m_sink->abort();
         m_reply.reset();
@@ -273,32 +250,25 @@ void Download::downloadFinished()
 
 void Download::downloadReadyRead()
 {
-    if(m_status == Job_InProgress)
+    if (m_status == Job_InProgress) {
-    {
         auto data = m_reply->readAll();
         m_status = m_sink->write(data);
-        if(m_status == Job_Failed)
+        if (m_status == Job_Failed) {
-        {
             qCritical() << "Failed to process response chunk for " << m_target_path;
         }
         // qDebug() << "Download" << m_url.toString() << "gained" << data.size() << "bytes";
-    }
+    } else {
-    else
-    {
         qCritical() << "Cannot write to " << m_target_path << ", illegal status" << m_status;
     }
 }
 
-}
+}  // namespace Net
 
 bool Net::Download::abort()
 {
-    if(m_reply)
+    if (m_reply) {
-    {
         m_reply->abort();
-    }
+    } else {
-    else
-    {
         m_status = Job_Aborted;
     }
     return true;

launcher/ui/pages/modplatform/ModModel.cpp

@@ -21,7 +21,8 @@ auto ListModel::debugName() const -> QString
 
 void ListModel::fetchMore(const QModelIndex& parent)
 {
-    if (parent.isValid()) return;
+    if (parent.isValid())
+        return;
     if (nextSearchOffset == 0) {
         qWarning() << "fetchMore with 0 offset is wrong...";
         return;
@@ -32,7 +33,9 @@ void ListModel::fetchMore(const QModelIndex& parent)
 auto ListModel::data(const QModelIndex& index, int role) const -> QVariant
 {
     int pos = index.row();
-    if (pos >= modpacks.size() || pos < 0 || !index.isValid()) { return QString("INVALID INDEX %1").arg(pos); }
+    if (pos >= modpacks.size() || pos < 0 || !index.isValid()) {
+        return QString("INVALID INDEX %1").arg(pos);
+    }
 
     ModPlatform::IndexedPack pack = modpacks.at(pos);
     if (role == Qt::DisplayRole) {
@@ -46,7 +49,9 @@ auto ListModel::data(const QModelIndex& index, int role) const -> QVariant
         }
         return pack.description;
     } else if (role == Qt::DecorationRole) {
-        if (m_logoMap.contains(pack.logoName)) { return (m_logoMap.value(pack.logoName)); }
+        if (m_logoMap.contains(pack.logoName)) {
+            return (m_logoMap.value(pack.logoName));
+        }
         QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
         ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
         return icon;
@@ -63,16 +68,15 @@ void ListModel::requestModVersions(ModPlatform::IndexedPack const& current)
 {
     auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
 
-    m_parent->apiProvider()->getVersions(this,
+    m_parent->apiProvider()->getVersions(this, { current.addonId.toString(), getMineVersions(), profile->getModLoader() });
-            { current.addonId.toString(), getMineVersions(), profile->getModLoader() });
 }
 
 void ListModel::performPaginatedSearch()
 {
     auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
 
-    m_parent->apiProvider()->searchMods(this,
+    m_parent->apiProvider()->searchMods(
-            { nextSearchOffset, currentSearchTerm, getSorts()[currentSort], profile->getModLoader(), getMineVersions() });
+        this, { nextSearchOffset, currentSearchTerm, getSorts()[currentSort], profile->getModLoader(), getMineVersions() });
 }
 
 void ListModel::refresh()
@@ -93,11 +97,9 @@ void ListModel::refresh()
 
 void ListModel::searchWithTerm(const QString& term, const int sort, const bool filter_changed)
 {
-    if (currentSearchTerm == term 
+    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort && !filter_changed) {
-            && currentSearchTerm.isNull() == term.isNull() 
+        return;
-            && currentSort == sort 
+    }
-            && !filter_changed) 
-        { return; }
 
     currentSearchTerm = term;
     currentSort = sort;
@@ -118,7 +120,9 @@ void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallbac
 
 void ListModel::requestLogo(QString logo, QString url)
 {
-    if (m_loadingLogos.contains(logo) || m_failedLogos.contains(logo)) { return; }
+    if (m_loadingLogos.contains(logo) || m_failedLogos.contains(logo)) {
+        return;
+    }
 
     MetaEntryPtr entry =
         APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)));
@@ -129,7 +133,9 @@ void ListModel::requestLogo(QString logo, QString url)
     QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] {
         job->deleteLater();
         emit logoLoaded(logo, QIcon(fullPath));
-        if (waitingCallbacks.contains(logo)) { waitingCallbacks.value(logo)(fullPath); }
+        if (waitingCallbacks.contains(logo)) {
+            waitingCallbacks.value(logo)(fullPath);
+        }
     });
 
     QObject::connect(job, &NetJob::failed, this, [this, logo, job] {
@@ -148,7 +154,9 @@ void ListModel::logoLoaded(QString logo, QIcon out)
     m_loadingLogos.removeAll(logo);
     m_logoMap.insert(logo, out);
     for (int i = 0; i < modpacks.size(); i++) {
-        if (modpacks[i].logoName == logo) { emit dataChanged(createIndex(i, 0), createIndex(i, 0), { Qt::DecorationRole }); }
+        if (modpacks[i].logoName == logo) {
+            emit dataChanged(createIndex(i, 0), createIndex(i, 0), { Qt::DecorationRole });
+        }
     }
 }
 
@@ -199,7 +207,9 @@ void ListModel::searchRequestFailed(QString reason)
         // 409 Gone, notify user to update
         QMessageBox::critical(nullptr, tr("Error"),
                               //: %1 refers to the launcher itself
-                              QString("%1 %2").arg(m_parent->displayName()).arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_NAME)));
+                              QString("%1 %2")
+                                  .arg(m_parent->displayName())
+                                  .arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_NAME)));
     }
     jobPtr.reset();
 
@@ -218,9 +228,12 @@ void ListModel::searchRequestFailed(QString reason)
 void ListModel::versionRequestSucceeded(QJsonDocument doc, QString addonId)
 {
     auto& current = m_parent->getCurrent();
-    if (addonId != current.addonId) { return; }
+    if (addonId != current.addonId) {
+        return;
+    }
+
+    auto arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
 
-    QJsonArray arr = doc.array();
     try {
         loadIndexedPackVersions(current, arr);
     } catch (const JSONValidationError& e) {

launcher/ui/pages/modplatform/flame/FlameModModel.cpp

@@ -1,5 +1,5 @@
 #include "FlameModModel.h"
-
+#include "Json.h"
 #include "modplatform/flame/FlameModIndex.h"
 
 namespace FlameMod {
@@ -19,7 +19,7 @@ void ListModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray&
 
 auto ListModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
-    return obj.array();
+    return Json::ensureArray(obj.object(), "data");
 }
 
 }  // namespace FlameMod

launcher/ui/pages/modplatform/flame/FlameModel.cpp

@@ -1,6 +1,6 @@
 #include "FlameModel.h"
-#include "Application.h"
 #include <Json.h>
+#include "Application.h"
 
 #include <MMCStrings.h>
 #include <Version.h>
@@ -9,13 +9,9 @@
 
 namespace Flame {
 
-ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
+ListModel::ListModel(QObject* parent) : QAbstractListModel(parent) {}
-{
-}
 
-ListModel::~ListModel()
+ListModel::~ListModel() {}
-{
-}
 
 int ListModel::rowCount(const QModelIndex& parent) const
 {
@@ -30,40 +26,29 @@ int ListModel::columnCount(const QModelIndex &parent) const
 QVariant ListModel::data(const QModelIndex& index, int role) const
 {
     int pos = index.row();
-    if(pos >= modpacks.size() || pos < 0 || !index.isValid())
+    if (pos >= modpacks.size() || pos < 0 || !index.isValid()) {
-    {
         return QString("INVALID INDEX %1").arg(pos);
     }
 
     IndexedPack pack = modpacks.at(pos);
-    if(role == Qt::DisplayRole)
+    if (role == Qt::DisplayRole) {
-    {
         return pack.name;
-    }
+    } else if (role == Qt::ToolTipRole) {
-    else if (role == Qt::ToolTipRole)
+        if (pack.description.length() > 100) {
-    {
-        if(pack.description.length() > 100)
-        {
             // some magic to prevent to long tooltips and replace html linebreaks
             QString edit = pack.description.left(97);
             edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
             return edit;
-
         }
         return pack.description;
-    }
+    } else if (role == Qt::DecorationRole) {
-    else if(role == Qt::DecorationRole)
+        if (m_logoMap.contains(pack.logoName)) {
-    {
-        if(m_logoMap.contains(pack.logoName))
-        {
             return (m_logoMap.value(pack.logoName));
         }
         QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
         ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
         return icon;
-    }
+    } else if (role == Qt::UserRole) {
-    else if(role == Qt::UserRole)
-    {
         QVariant v;
         v.setValue(pack);
         return v;
@@ -91,8 +76,7 @@ void ListModel::logoFailed(QString logo)
 
 void ListModel::requestLogo(QString logo, QString url)
 {
-    if(m_loadingLogos.contains(logo) || m_failedLogos.contains(logo))
+    if (m_loadingLogos.contains(logo) || m_failedLogos.contains(logo)) {
-    {
         return;
     }
 
@@ -101,18 +85,15 @@ void ListModel::requestLogo(QString logo, QString url)
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
     auto fullPath = entry->getFullPath();
-    QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job]
+    QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] {
-    {
         job->deleteLater();
         emit logoLoaded(logo, QIcon(fullPath));
-        if(waitingCallbacks.contains(logo))
+        if (waitingCallbacks.contains(logo)) {
-        {
             waitingCallbacks.value(logo)(fullPath);
         }
     });
 
-    QObject::connect(job, &NetJob::failed, this, [this, logo, job]
+    QObject::connect(job, &NetJob::failed, this, [this, logo, job] {
-    {
         job->deleteLater();
         emit logoFailed(logo);
     });
@@ -124,12 +105,9 @@ void ListModel::requestLogo(QString logo, QString url)
 
 void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
 {
-    if(m_logoMap.contains(logo))
+    if (m_logoMap.contains(logo)) {
-    {
         callback(APPLICATION->metacache()->resolveEntry("FlamePacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
-    }
+    } else {
-    else
-    {
         requestLogo(logo, logoUrl);
     }
 }
@@ -159,15 +137,18 @@ void ListModel::performPaginatedSearch()
 {
     NetJob* netJob = new NetJob("Flame::Search", APPLICATION->network());
     auto searchUrl = QString(
-        "https://addons-ecs.forgesvc.net/api/v2/addon/search?"
+                         "https://api.curseforge.com/v1/mods/search?"
-        "categoryId=0&"
                          "gameId=432&"
+                         "classId=4471&"
                          "index=%1&"
                          "pageSize=25&"
                          "searchFilter=%2&"
-        "sectionId=4471&"
+                         "sortField=%3&"
-        "sort=%3"
+                         "sortOrder=desc")
-    ).arg(nextSearchOffset).arg(currentSearchTerm).arg(currentSort);
+                         .arg(nextSearchOffset)
+                         .arg(currentSearchTerm)
+                         .arg(currentSort + 1);
+
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchUrl), &response));
     jobPtr = netJob;
     jobPtr->start();
@@ -186,8 +167,7 @@ void ListModel::searchWithTerm(const QString& term, int sort)
         jobPtr->abort();
         searchState = ResetRequested;
         return;
-    }
+    } else {
-    else {
         beginResetModel();
         modpacks.clear();
         endResetModel();
@@ -204,24 +184,22 @@ void Flame::ListModel::searchRequestFinished()
     QJsonParseError parse_error;
     QJsonDocument doc = QJsonDocument::fromJson(response, &parse_error);
     if (parse_error.error != QJsonParseError::NoError) {
-        qWarning() << "Error while parsing JSON response from CurseForge at " << parse_error.offset << " reason: " << parse_error.errorString();
+        qWarning() << "Error while parsing JSON response from CurseForge at " << parse_error.offset
+                   << " reason: " << parse_error.errorString();
         qWarning() << response;
         return;
     }
 
     QList<Flame::IndexedPack> newList;
-    auto packs = doc.array();
+    auto packs = Json::ensureArray(doc.object(), "data");
     for (auto packRaw : packs) {
         auto packObj = packRaw.toObject();
 
         Flame::IndexedPack pack;
-        try
+        try {
-        {
             Flame::loadIndexedPack(pack, packObj);
             newList.append(pack);
-        }
+        } catch (const JSONValidationError& e) {
-        catch(const JSONValidationError &e)
-        {
             qWarning() << "Error while loading pack from CurseForge: " << e.cause();
             continue;
         }
@@ -253,5 +231,4 @@ void Flame::ListModel::searchRequestFailed(QString reason)
     }
 }
 
-}
+}  // namespace Flame
-

launcher/ui/pages/modplatform/flame/FlamePage.cpp

@@ -39,13 +39,12 @@
 #include <QKeyEvent>
 
 #include "Application.h"
+#include "FlameModel.h"
+#include "InstanceImportTask.h"
 #include "Json.h"
 #include "ui/dialogs/NewInstanceDialog.h"
-#include "InstanceImportTask.h"
-#include "FlameModel.h"
 
-FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget *parent)
+FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog)
-    : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog)
 {
     ui->setupUi(this);
     connect(ui->searchButton, &QPushButton::clicked, this, &FlamePage::triggerSearch);
@@ -112,10 +111,8 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
 {
     ui->versionSelectionBox->clear();
 
-    if(!first.isValid())
+    if (!first.isValid()) {
-    {
+        if (isOpened) {
-        if(isOpened)
-        {
             dialog->setSuggestedPack();
         }
         return;
@@ -146,33 +143,29 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
     ui->packDescription->setHtml(text + current.description);
 
-    if (current.versionsLoaded == false)
+    if (current.versionsLoaded == false) {
-    {
         qDebug() << "Loading flame modpack versions";
         auto netJob = new NetJob(QString("Flame::PackVersions(%1)").arg(current.name), APPLICATION->network());
         auto response = new QByteArray();
         int addonId = current.addonId;
-        netJob->addNetAction(Net::Download::makeByteArray(QString("https://addons-ecs.forgesvc.net/api/v2/addon/%1/files").arg(addonId), response));
+        netJob->addNetAction(Net::Download::makeByteArray(QString("https://api.curseforge.com/v1/mods/%1/files").arg(addonId), response));
 
-        QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId]
+        QObject::connect(netJob, &NetJob::succeeded, this, [this, response, addonId] {
-        {
             if (addonId != current.addonId) {
                 return;  // wrong request
             }
             QJsonParseError parse_error;
             QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error);
             if (parse_error.error != QJsonParseError::NoError) {
-                qWarning() << "Error while parsing JSON response from CurseForge at " << parse_error.offset << " reason: " << parse_error.errorString();
+                qWarning() << "Error while parsing JSON response from CurseForge at " << parse_error.offset
+                           << " reason: " << parse_error.errorString();
                 qWarning() << *response;
                 return;
             }
-            QJsonArray arr = doc.array();
+            auto arr = Json::ensureArray(doc.object(), "data");
-            try
+            try {
-            {
                 Flame::loadIndexedPackVersions(current, arr);
-            }
+            } catch (const JSONValidationError& e) {
-            catch(const JSONValidationError &e)
-            {
                 qDebug() << *response;
                 qWarning() << "Error while reading flame modpack version: " << e.cause();
             }
@@ -183,15 +176,12 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
             suggestCurrent();
         });
-        QObject::connect(netJob, &NetJob::finished, this, [response, netJob]
+        QObject::connect(netJob, &NetJob::finished, this, [response, netJob] {
-        {
             netJob->deleteLater();
             delete response;
         });
         netJob->start();
-    }
+    } else {
-    else
-    {
         for (auto version : current.versions) {
             ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
         }
@@ -202,13 +192,11 @@ void FlamePage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
 void FlamePage::suggestCurrent()
 {
-    if(!isOpened)
+    if (!isOpened) {
-    {
         return;
     }
 
-    if (selectedVersion.isEmpty())
+    if (selectedVersion.isEmpty()) {
-    {
         dialog->setSuggestedPack();
         return;
     }
@@ -216,16 +204,13 @@ void FlamePage::suggestCurrent()
     dialog->setSuggestedPack(current.name, new InstanceImportTask(selectedVersion));
     QString editedLogoName;
     editedLogoName = "curseforge_" + current.logoName.section(".", 0, 0);
-    listModel->getLogo(current.logoName, current.logoUrl, [this, editedLogoName](QString logo)
+    listModel->getLogo(current.logoName, current.logoUrl,
-    {
+                       [this, editedLogoName](QString logo) { dialog->setSuggestedIconFromFile(logo, editedLogoName); });
-        dialog->setSuggestedIconFromFile(logo, editedLogoName);
-    });
 }
 
 void FlamePage::onVersionSelectionChanged(QString data)
 {
-    if(data.isNull() || data.isEmpty())
+    if (data.isNull() || data.isEmpty()) {
-    {
         selectedVersion = "";
         return;
     }