Updated url function

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

4 files changed, 10 insertions, 13 deletions

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index e93ff8bc..d5b96bad 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -170,7 +170,7 @@ auto Mod::metaurl() const -> QString
 {
     if (metadata() == nullptr)
         return homeurl();
-    return ModPlatform::getMetaURL(metadata()->provider, metadata()->slug);
+    return ModPlatform::getMetaURL(metadata()->provider, metadata()->project_id);
 }
 
 auto Mod::description() const -> QString
diff --git a/launcher/modplatform/ModIndex.cpp b/launcher/modplatform/ModIndex.cpp
index c68333c5..a1c4d891 100644
--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@@ -77,11 +77,10 @@ auto ProviderCapabilities::hash(ResourceProvider p, QIODevice* device, QString t
     return { hash.result().toHex() };
 }
 
-QString getMetaURL(ResourceProvider provider, QString slug)
+QString getMetaURL(ResourceProvider provider, QVariant projectID)
 {
-    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/minecraft/mc-mods/"
-                                                               : "https://modrinth.com/mod/") +
-           slug.remove(".pw.toml");
+    return ((provider == ModPlatform::ResourceProvider::FLAME) ? "https://www.curseforge.com/projects/" : "https://modrinth.com/mod/") +
+           projectID.toString();
 }
 
 }  // namespace ModPlatform
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h
index 83412169..773ee934 100644
--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@@ -128,7 +128,7 @@ struct IndexedPack {
         return std::any_of(versions.constBegin(), versions.constEnd(), [](auto const& v) { return v.is_currently_selected; });
     }
 };
-QString getMetaURL(ResourceProvider provider, QString slug);
+QString getMetaURL(ResourceProvider provider, QVariant projectID);
 
 struct OverrideDep {
     QString quilt;
diff --git a/launcher/modplatform/flame/FlamePackExportTask.cpp b/launcher/modplatform/flame/FlamePackExportTask.cpp
index 54294d7b..d729e977 100644
--- a/launcher/modplatform/flame/FlamePackExportTask.cpp
+++ b/launcher/modplatform/flame/FlamePackExportTask.cpp
@@ -36,7 +36,7 @@
 #include "modplatform/helpers/HashUtils.h"
 #include "tasks/Task.h"
 
-const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>";
+const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}</a></li>\n";
 
 FlamePackExportTask::FlamePackExportTask(const QString& name,
                                          const QString& version,
@@ -338,12 +338,10 @@ void FlamePackExportTask::buildZip()
         QString content = "";
         for (auto mod : resolvedFiles) {
             if (mod.isMod) {
-                auto line = QString(TEMPLATE)
-                                .replace("{name}", mod.name)
-                                .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.slug));
-                if (!mod.authors.isEmpty())
-                    line = line.replace("{authors}", QString(" (by {%1})").arg(mod.authors));
-                content += line + "\n";
+                content += QString(TEMPLATE)
+                               .replace("{name}", mod.name)
+                               .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId))
+                               .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by {%1})").arg(mod.authors) : "");
             }
         }
         content = "<ul>" + content + "</ul>";