From 4cf81648dc656c35e846e74c88aa4d9addb7f5e4 Mon Sep 17 00:00:00 2001
From: Kir_Antipov <kp.antipov@gmail.com>
Date: Sat, 20 May 2023 15:11:48 +0300
Subject: [PATCH] Fixed default value resolution in `ModrinthUploader`

---
 src/platforms/modrinth/modrinth-uploader.ts | 13 +++++++------
 src/platforms/modrinth/modrinth-version.ts  | 12 +++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/platforms/modrinth/modrinth-uploader.ts b/src/platforms/modrinth/modrinth-uploader.ts
index a6badf7..3ece999 100644
--- a/src/platforms/modrinth/modrinth-uploader.ts
+++ b/src/platforms/modrinth/modrinth-uploader.ts
@@ -51,7 +51,7 @@ export class ModrinthUploader extends GenericPlatformUploader<ModrinthUploaderOp
      */
     protected async uploadCore(request: ModrinthUploadRequest): Promise<ModrinthUploadReport> {
         const api = new ModrinthApiClient({ token: request.token.unwrap() });
-        const unfeatureMode = request.unfeatureMode ?? request.featured ? ModrinthUnfeatureMode.SUBSET : ModrinthUnfeatureMode.NONE;
+        const unfeatureMode = request.unfeatureMode ?? (request.featured ? ModrinthUnfeatureMode.SUBSET : ModrinthUnfeatureMode.NONE);
 
         const project = await this.getProject(request.id, api);
         const version = await this.createVersion(request, project, api);
@@ -97,15 +97,16 @@ export class ModrinthUploader extends GenericPlatformUploader<ModrinthUploaderOp
         const dependencies = await this.convertToModrinthDependencies(request.dependencies, api);
 
         return await api.createVersion({
-            project_id: project.id,
             name: request.name,
             version_number: request.version,
+            project_id: project.id,
             changelog: request.changelog,
-            version_type: request.versionType,
-            featured: request.featured,
-            game_versions: gameVersions,
-            loaders,
             dependencies,
+            game_versions: gameVersions,
+            version_type: request.versionType,
+            loaders,
+            featured: request.featured,
+            files: request.files,
         });
     }
 
diff --git a/src/platforms/modrinth/modrinth-version.ts b/src/platforms/modrinth/modrinth-version.ts
index 1eb1ec9..33452c7 100644
--- a/src/platforms/modrinth/modrinth-version.ts
+++ b/src/platforms/modrinth/modrinth-version.ts
@@ -411,14 +411,16 @@ export function packModrinthVersionInit(version: ModrinthVersionInit): ModrinthV
     const { files = [] } = version;
 
     const data: ModrinthVersionInitData = {
-        // Default values
-        featured: true,
-        dependencies: [],
-        version_type: VersionType.RELEASE,
-
         // Unpack the `version`
         ...{ ...version, files: undefined },
+
+        // Default values
         name: version.name || version.version_number,
+        version_type: version.version_type ?? VersionType.RELEASE,
+        featured: version.featured ?? true,
+        dependencies: version.dependencies ?? [],
+        game_versions: version.game_versions ?? [],
+        loaders: version.loaders ?? [],
 
         // Names of each file part
         primary_file: files.length ? "_0" : undefined,