Fix version resultion sorting

Set cache expiry to 100 days

Author: Su5eD

core/src/main/kotlin/org/sinytra/probe/core/platform/ModrinthAPI.kt

@@ -9,6 +9,7 @@ import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.logging.*
 import io.ktor.client.plugins.resources.*
+import io.ktor.client.plugins.resources.Resources
 import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.resources.*
@@ -133,8 +134,8 @@ object ModrinthAPI {
             .takeIf { it.status.isSuccess() }
             ?.body<ModrinthVersion>()
 
-    suspend fun getCandidateVersion(projectId: String, gameVersions: List<String>, loader: String): ModrinthVersion? =
-        client.get(
+    suspend fun getCandidateVersion(projectId: String, gameVersions: List<String>, loader: String): ModrinthVersion? {
+        val versions = client.get(
             Projects.Id.Version(
                 Projects.Id(id = projectId),
                 loaders = "[\"${loader}\"]",
@@ -143,10 +144,17 @@ object ModrinthAPI {
         )
             .takeIf { it.status.isSuccess() }
             ?.body<List<ModrinthVersion>>()
-            ?.minByOrNull {
-                val fileGameVersions = it.gameVersions.sortedBy(gameVersions::indexOf)
-                gameVersions.indexOf(fileGameVersions.first())
-            }
+
+        if (versions == null) return null
+
+        // Priority order is defined by the order inside gameVersions
+        for (target in gameVersions) {
+            val match = versions.firstOrNull { target in it.gameVersions }
+            if (match != null) return match
+        }
+
+        return null
+    }
 
     suspend fun searchProjects(limit: Int, offset: Int, gameVersion: String, loader: String, excludeLoader: String?): ModrinthSearchResults? =
         client

core/src/main/kotlin/org/sinytra/probe/core/platform/ModrinthPlatform.kt

@@ -6,10 +6,10 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import org.sinytra.probe.base.ProjectSearchResult
-import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthVersionDependency
-import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthVersion
-import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthSearchResult
 import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthProject
+import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthSearchResult
+import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthVersion
+import org.sinytra.probe.core.platform.ModrinthAPI.ModrinthVersionDependency
 import org.sinytra.probe.core.service.CacheService
 import org.slf4j.LoggerFactory
 import java.nio.file.Path

core/src/main/kotlin/org/sinytra/probe/core/service/CacheService.kt

@@ -6,18 +6,24 @@ import io.lettuce.core.api.coroutines
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
 import kotlinx.serialization.json.Json
+import java.time.Duration
 
 @OptIn(ExperimentalLettuceCoroutinesApi::class)
 class CacheService(
     redis: StatefulRedisConnection<String, String>
 ) {
     val cmd = redis.coroutines()
+    val defaultExpiration: Duration = Duration.ofDays(100)
 
     suspend inline fun get(key: String): String? =
         cmd.get(key)
 
-    suspend inline fun set(key: String, value: String) =
+    suspend inline fun set(key: String, value: String, expiry: Duration? = defaultExpiration) {
         cmd.set(key, value)
+        if (expiry != null) {
+            cmd.expire(key, expiry)
+        }
+    }
 
     suspend inline fun del(key: String) =
         cmd.del(key)
@@ -36,7 +42,10 @@ class CacheService(
     suspend inline fun <reified T> getObject(key: String): T? =
         cmd.get(key)?.let { Json.decodeFromString<T>(it) }
 
-    suspend inline fun <reified T> setObject(key: String, value: T) {
+    suspend inline fun <reified T> setObject(key: String, value: T, expiry: Duration? = defaultExpiration) {
         cmd.set(key, Json.encodeToString(value))
+        if (expiry != null) {
+            cmd.expire(key, expiry)
+        }
     }
 }