From f4604bbf797673b089367ec6af42723084b17181 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 28 May 2022 09:19:53 -0300
Subject: change: update whitelisted hosts in Modrinth modpacks

---
 launcher/modplatform/modrinth/ModrinthPackManifest.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'launcher/modplatform/modrinth')

diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index f1ad39ce..b1c4fbcd 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -98,10 +98,6 @@ auto validateDownloadUrl(QUrl url) -> bool
     auto domain = url.host();
     if(domain == "cdn.modrinth.com")
         return true;
-    if(domain == "edge.forgecdn.net")
-        return true;
-    if(domain == "media.forgecdn.net")
-        return true;
     if(domain == "github.com")
         return true;
     if(domain == "raw.githubusercontent.com")
-- 
cgit 


From b5e00027d1a16744ae9287b1262e7f6405bd9d5d Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 28 May 2022 14:16:05 -0300
Subject: change: add 'gitlab.com' to whitelisted Modrinth modpack urls

---
 launcher/modplatform/modrinth/ModrinthPackManifest.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'launcher/modplatform/modrinth')

diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index b1c4fbcd..8b379480 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -102,6 +102,8 @@ auto validateDownloadUrl(QUrl url) -> bool
         return true;
     if(domain == "raw.githubusercontent.com")
         return true;
+    if(domain == "gitlab.com")
+        return true;
 
     return false;
 }
-- 
cgit 


From abd240468e362231ce8cbc23573faea9a0e657f4 Mon Sep 17 00:00:00 2001
From: Lenny McLennington <lennymclennington@protonmail.com>
Date: Sat, 28 May 2022 19:54:00 +0100
Subject: clean up validateDownloadUrl

---
 .../modplatform/modrinth/ModrinthPackManifest.cpp    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'launcher/modplatform/modrinth')

diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
index 8b379480..33116231 100644
--- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
+++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp
@@ -42,6 +42,8 @@
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
 
+#include <QSet>
+
 static ModrinthAPI api;
 
 namespace Modrinth {
@@ -95,17 +97,15 @@ void loadIndexedVersions(Modpack& pack, QJsonDocument& doc)
 
 auto validateDownloadUrl(QUrl url) -> bool
 {
+    static QSet<QString> domainWhitelist{
+        "cdn.modrinth.com",
+        "github.com",
+        "raw.githubusercontent.com",
+        "gitlab.com"
+    };
+
     auto domain = url.host();
-    if(domain == "cdn.modrinth.com")
-        return true;
-    if(domain == "github.com")
-        return true;
-    if(domain == "raw.githubusercontent.com")
-        return true;
-    if(domain == "gitlab.com")
-        return true;
-
-    return false;
+    return domainWhitelist.contains(domain);
 }
 
 auto loadIndexedVersion(QJsonObject &obj) -> ModpackVersion
-- 
cgit 


From 2746251dcd7ccbe83ca969c6a6b0f6e9c4d9160d Mon Sep 17 00:00:00 2001
From: timoreo <timo.oreo34@gmail.com>
Date: Sun, 29 May 2022 18:23:34 +0200
Subject: Fix modrinth search filters

---
 launcher/modplatform/ModAPI.h               | 2 +-
 launcher/modplatform/modrinth/ModrinthAPI.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'launcher/modplatform/modrinth')

diff --git a/launcher/modplatform/ModAPI.h b/launcher/modplatform/ModAPI.h
index 4230df0b..eb0de3f0 100644
--- a/launcher/modplatform/ModAPI.h
+++ b/launcher/modplatform/ModAPI.h
@@ -68,7 +68,7 @@ class ModAPI {
     {
         QString s;
         for(auto& ver : mcVersions){
-            s += QString("%1,").arg(ver.toString());
+            s += QString("\"%1\",").arg(ver.toString());
         }
         s.remove(s.length() - 1, 1); //remove last comma
         return s;
diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 79bc5175..6119a4df 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -79,11 +79,11 @@ class ModrinthAPI : public NetworkModAPI {
     {
         return QString(BuildConfig.MODRINTH_PROD_URL +
                        "/project/%1/version?"
-                       "game_versions=[%2]"
+                       "game_versions=[%2]&"
                        "loaders=[\"%3\"]")
-            .arg(args.addonId)
-            .arg(getGameVersionsString(args.mcVersions))
-            .arg(getModLoaderStrings(args.loaders).join("\",\""));
+            .arg(args.addonId,
+             getGameVersionsString(args.mcVersions),
+             getModLoaderStrings(args.loaders).join("\",\""));
     };
 
     auto getGameVersionsArray(std::list<Version> mcVersions) const -> QString
-- 
cgit