change: use build variables for the modrinth API URLs

Make it more consistent with the others

3 files changed, 18 insertions, 15 deletions

diff --git a/launcher/modplatform/modrinth/ModrinthAPI.h b/launcher/modplatform/modrinth/ModrinthAPI.h
index 86852c94..87438375 100644
--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "BuildConfig.h"
 #include "modplatform/ModAPI.h"
 #include "modplatform/helpers/NetworkModAPI.h"
 
@@ -47,13 +48,13 @@ class ModrinthAPI : public NetworkModAPI {
             return "";
         }
 
-        return QString(
-                   "https://api.modrinth.com/v2/search?"
-                   "offset=%1&"
-                   "limit=25&"
-                   "query=%2&"
-                   "index=%3&"
-                   "facets=[[%4],%5[\"project_type:mod\"]]")
+        return QString(BuildConfig.MODRINTH_PROD_URL +
+                       "/search?"
+                       "offset=%1&"
+                       "limit=25&"
+                       "query=%2&"
+                       "index=%3&"
+                       "facets=[[%4],%5[\"project_type:mod\"]]")
             .arg(args.offset)
             .arg(args.search)
             .arg(args.sorting)
@@ -63,9 +64,10 @@ class ModrinthAPI : public NetworkModAPI {
 
     inline auto getVersionsURL(VersionSearchArgs& args) const -> QString override
     {
-        return QString("https://api.modrinth.com/v2/project/%1/version?"
-                "game_versions=[%2]"
-                "loaders=[\"%3\"]")
+        return QString(BuildConfig.MODRINTH_PROD_URL +
+                       "/project/%1/version?"
+                       "game_versions=[%2]"
+                       "loaders=[\"%3\"]")
             .arg(args.addonId)
             .arg(getGameVersionsString(args.mcVersions))
             .arg(getModLoaderStrings(args.loader).join("\",\""));
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index 121f5d4e..1d1b4c8e 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -71,10 +71,10 @@ void ModpackListModel::performPaginatedSearch()
     // TODO: Move to standalone API
     NetJob* netJob = new NetJob("Modrinth::SearchModpack", APPLICATION->network());
     auto searchAllUrl = QString(
-                            "https://staging-api.modrinth.com/v2/search?"
-                            "query=%1&"
+                            "%1/search?"
+                            "query=%2&"
                             "facets=[[\"project_type:modpack\"]]")
-                            .arg(currentSearchTerm);
+                            .arg(BuildConfig.MODRINTH_STAGING_URL, currentSearchTerm);
 
     netJob->addNetAction(Net::Download::makeByteArray(QUrl(searchAllUrl), &m_all_response));
 
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index acfd14b5..5dc66e56 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -38,6 +38,7 @@
 
 #include "ModrinthModel.h"
 
+#include "BuildConfig.h"
 #include "InstanceImportTask.h"
 #include "Json.h"
 
@@ -122,7 +123,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
         QString id = current.id;
 
-        netJob->addNetAction(Net::Download::makeByteArray(QString("https://staging-api.modrinth.com/v2/project/%1").arg(id), response));
+        netJob->addNetAction(Net::Download::makeByteArray(QString("%1/project/%2").arg(BuildConfig.MODRINTH_STAGING_URL, id), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, id] {
             if (id != current.id) {
@@ -167,7 +168,7 @@ void ModrinthPage::onSelectionChanged(QModelIndex first, QModelIndex second)
         QString id = current.id;
 
         netJob->addNetAction(
-            Net::Download::makeByteArray(QString("https://staging-api.modrinth.com/v2/project/%1/version").arg(id), response));
+            Net::Download::makeByteArray(QString("%1/project/%2/version").arg(BuildConfig.MODRINTH_STAGING_URL, id), response));
 
         QObject::connect(netJob, &NetJob::succeeded, this, [this, response, id] {
             if (id != current.id) {