optimize: Improve mod versions request to Modrinth

This uses more arguments in the GET request for mod versions on the
Modrinth API, filtering what versions can be returned, decreasing load
on Modrinth servers and improving a little the time it takes for the versions to be
available to the user.

This also removes the now unneeded check on correct modloaders in
ModrinthPackIndex, since it is now filtered by the Modrinth server.

Lastly, this adds a couple of helper functions in ModModel.

2 files changed, 18 insertions, 14 deletions

diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index cf4dec1a..30952e99 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -30,11 +30,27 @@ class ModrinthAPI : public NetworkModAPI {
             .arg(args.version);
     };
 
-    inline auto getVersionsURL(const QString& addonId) const -> QString override
+    inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
     {
-        return QString("https://api.modrinth.com/v2/project/%1/version").arg(addonId);
+        return QString("https://api.modrinth.com/v2/project/%1/version?"
+                "game_versions=[%2]"
+                "loaders=[%3]")
+            .arg(args.addonId)
+            .arg(getGameVersionsString(args.mcVersions))
+            .arg(getModLoaderString(args.loader));
     };
 
+    inline auto getGameVersionsString(QList<QString> mcVersions) const -> QString
+    {
+        QString s;
+        for(int i = 0; i < mcVersions.count(); i++){
+            s += mcVersions.at(i);
+            if(i < mcVersions.count() - 1)
+                s += ",";
+        }
+        return s;
+    }
+
     inline auto getModLoaderString(ModLoaderType modLoader) const -> QString
     {
         switch (modLoader) {
diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
index 82988cf6..a4e56d4f 100644
--- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp
@@ -30,7 +30,6 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
                                        BaseInstance* inst)
 {
     QVector<ModPlatform::IndexedVersion> unsortedVersions;
-    bool hasFabric = !(static_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.fabricmc.fabric-loader").isEmpty();
     QString mcVersion = (static_cast<MinecraftInstance*>(inst))->getPackProfile()->getComponentVersion("net.minecraft");
 
     for (auto versionIter : arr) {
@@ -61,17 +60,6 @@ void Modrinth::loadIndexedPackVersions(ModPlatform::IndexedPack& pack,
             auto parent = files[i].toObject();
             auto fileName = Json::requireString(parent, "filename");
 
-            // Grab the correct mod loader
-            if(hasFabric){
-                if(fileName.contains("forge",Qt::CaseInsensitive)){
-                    i++;
-                    continue;
-                }
-            } else if(fileName.contains("fabric", Qt::CaseInsensitive)){
-                i++;
-                continue;
-            }
-
             // Grab the primary file, if available
             if(Json::requireBoolean(parent, "primary"))
                 break;