Fix duplicates in Modrinth dependency lookups

packwiz · Jul 2, 2023 · 99d0af1 · 99d0af1
1 parent 4146540
commit 99d0af1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/modrinth/install.go b/modrinth/install.go
@@ -240,11 +240,12 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
 		for _, dep := range version.Dependencies {
 			// TODO: recommend optional dependencies?
 			if dep.DependencyType != nil && *dep.DependencyType == "required" {
-				if dep.ProjectID != nil {
-					depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt, mcVersion))
-				}
 				if dep.VersionID != nil {
 					depVersionIDPendingQueue = append(depVersionIDPendingQueue, *dep.VersionID)
+				} else {
+					if dep.ProjectID != nil {
+						depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt, mcVersion))
+					}
 				}
 			}
 		}
@@ -285,6 +286,10 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
 				}
 				depProjectIDPendingQueue = depProjectIDPendingQueue[:i]
 
+				// Clean up duplicates from dep queue (from deps on both QFAPI + FAPI)
+				slices.Sort(depProjectIDPendingQueue)
+				slices.Compact(depProjectIDPendingQueue)
+
 				if len(depProjectIDPendingQueue) == 0 {
 					break
 				}