From 76dfb7825ade6554095ac3a09b3accdbd4db5138 Mon Sep 17 00:00:00 2001
From: flow <thiagodonato300@gmail.com>
Date: Sat, 2 Apr 2022 20:08:37 -0300
Subject: fix: 'All' filter working and get around CF API capabilities

---
 launcher/modplatform/flame/FlameAPI.h       | 6 ++++--
 launcher/modplatform/modrinth/ModrinthAPI.h | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'launcher/modplatform')

diff --git a/launcher/modplatform/flame/FlameAPI.h b/launcher/modplatform/flame/FlameAPI.h
index 690ee15c..9bcc357e 100644
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@@ -6,6 +6,8 @@ class FlameAPI : public NetworkModAPI {
    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?"
                    "gameId=432&"
@@ -17,12 +19,12 @@ class FlameAPI : public NetworkModAPI {
                    "searchFilter=%2&"
                    "sort=%3&"
                    "modLoaderType=%4&"
-                   "gameVersion=%5")
+                   "%5")
             .arg(args.offset)
             .arg(args.search)
             .arg(args.sorting)
             .arg(args.mod_loader)
-            .arg(getGameVersionsString(args.versions));
+            .arg(gameVersionStr);
     };
 
     inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 87534ee9..6604d772 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -22,7 +22,7 @@ class ModrinthAPI : public NetworkModAPI {
                    "limit=25&"
                    "query=%2&"
                    "index=%3&"
-                   "facets=[[\"categories:%4\"],[%5],[\"project_type:mod\"]]")
+                   "facets=[[\"categories:%4\"],%5[\"project_type:mod\"]]")
             .arg(args.offset)
             .arg(args.search)
             .arg(args.sorting)
@@ -47,7 +47,7 @@ class ModrinthAPI : public NetworkModAPI {
             s += QString("\"versions:%1\",").arg(ver.toString());
         }
         s.remove(s.length() - 1, 1); //remove last comma
-        return s;
+        return s.isEmpty() ? QString() : QString("[%1],").arg(s);
     }
 
     static auto getModLoaderString(ModLoaderType type) -> const QString
-- 
cgit