Merge pull request #1427 from ZalithLauncher/main

merge main

Author: MovTery

LayerController/src/main/java/com/movtery/layer_controller/data/NormalData.kt

@@ -91,12 +91,19 @@ data class NormalData(
  * 过滤出有效的点击事件
  */
 internal fun List<ClickEvent>.filterValidEvent(): List<ClickEvent> {
-    val (sendTextEvents, otherEvents) = partition { event ->
-        event.type == ClickEvent.Type.SendText
+    var foundValidSendText = false
+    return filter { event ->
+        if (event.type == ClickEvent.Type.SendText) {
+            if (!foundValidSendText && event.key.isNotEmpty()) {
+                foundValidSendText = true
+                true
+            } else {
+                false
+            }
+        } else {
+            true
+        }
     }
-    //                  仅保留一个有效的发送文本的事件
-    val validSendText = sendTextEvents.firstOrNull { it.key.isNotEmpty() }
-    return otherEvents + listOfNotNull(validSendText)
 }
 
 /**

ZalithLauncher/src/main/AndroidManifest.xml

@@ -122,7 +122,7 @@
             android:screenOrientation="sensorLandscape" />
         <activity android:name=".ui.activities.ErrorActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation"
-            android:screenOrientation="sensor" />
+            android:screenOrientation="sensorLandscape" />
         <activity android:name=".ui.activities.FatalErrorActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation"
             android:theme="@style/Theme.Material3.DayNight.Dialog.Alert" />

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/account/microsoft/MicrosoftAuthenticator.kt

@@ -72,6 +72,7 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration.Companion.milliseconds
 
 private const val TAG = "MicrosoftAuth"
 
@@ -151,7 +152,7 @@ suspend fun getTokenResponse(
 
         if (checkIsReallyCancelled()) throw CancellationException("Authentication cancelled")
 
-        delay(pollingInterval).also {
+        delay(pollingInterval.milliseconds).also {
             context.ensureActive()
         }
     }

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/addons/mirror/_SourceUtils.kt

@@ -24,6 +24,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
 import kotlinx.io.IOException
+import kotlin.time.Duration.Companion.milliseconds
 
 private const val TAG = "SourceUtils"
 
@@ -43,7 +44,7 @@ suspend fun <T> runMirrorable(
     loop@ for (source in sources) {
         ensureActive()
         if (source.delayMillis > 0) {
-            delay(source.delayMillis)
+            delay(source.delayMillis.milliseconds)
         }
         ensureActive()
 

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/curseforge/CurseForgeSearchResult.kt

@@ -22,6 +22,7 @@ import com.movtery.zalithlauncher.game.download.assets.platform.PlatformClasses
 import com.movtery.zalithlauncher.game.download.assets.platform.PlatformSearchResult
 import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.CurseForgeData
 import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.CurseForgePagination
+import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.isApproved
 import com.movtery.zalithlauncher.game.download.assets.platform.searchRankWithChineseBias
 import com.movtery.zalithlauncher.game.download.assets.utils.getTranslations
 import com.movtery.zalithlauncher.ui.screens.content.download.assets.elements.AssetsPage
@@ -34,17 +35,18 @@ class CurseForgeSearchResult(
      * 响应数据
      */
     @SerialName("data")
-    val data: Array<CurseForgeData>,
+    private val data: Array<CurseForgeData>,
 
     /**
      * 响应分页信息
      */
     @SerialName("pagination")
-    val pagination: CurseForgePagination
+    private val pagination: CurseForgePagination
 ): PlatformSearchResult {
     override fun getAssetsPage(classes: PlatformClasses): AssetsPage {
-        val mcmodData = data.map {
-            it to classes.getTranslations().getModBySlugId(it.slug)
+        val mcmodData = data.mapNotNull { data0 ->
+            if (!data0.isApproved()) return@mapNotNull null
+            data0 to classes.getTranslations().getModBySlugId(data0.slug)
         }
         val pageSize = pagination.pageSize
         val isLastPage = pagination.resultCount < pageSize ||
@@ -63,7 +65,7 @@ class CurseForgeSearchResult(
         searchFilter: String,
         classes: PlatformClasses
     ): PlatformSearchResult {
-        val newData = data.toList()
+        val newData = data.filter { it.isApproved() }
             .searchRankWithChineseBias(searchFilter, classes) { it.slug }
             .toTypedArray()
         return CurseForgeSearchResult(newData, pagination)

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/curseforge/CurseForgeSearcher.kt

@@ -28,10 +28,12 @@ import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.model
 import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.CurseForgeProject
 import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.CurseForgeVersion
 import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.CurseForgeVersions
+import com.movtery.zalithlauncher.game.download.assets.platform.curseforge.models.isApproved
 import com.movtery.zalithlauncher.utils.file.MurmurHash2Incremental
 import com.movtery.zalithlauncher.utils.network.httpGetJson
 import com.movtery.zalithlauncher.utils.network.httpPostJson
 import io.ktor.http.Parameters
+import io.ktor.server.plugins.NotFoundException
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.sync.Semaphore
@@ -62,10 +64,12 @@ class CurseForgeSearcher(
     }
 
     override suspend fun getProject(projectID: String): CurseForgeProject {
-        return httpGetJson(
+        val project = httpGetJson<CurseForgeProject>(
             url = "$api/mods/$projectID",
             headers = listOf("x-api-key" to apiKey)
         )
+        if (!project.isApproved()) throw NotFoundException("The project {$projectID} is not in a publicly available state.")
+        return project
     }
 
     /**

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/curseforge/models/CurseForgeData.kt

@@ -353,4 +353,9 @@ class CurseForgeData(
         }.toSet().takeIf { it.isNotEmpty() }
             ?.sortedWith { o1, o2 -> o1.index() - o2.index() }
     }
-}
+}
+
+/**
+ * @return 该模组是否可见
+ */
+fun CurseForgeData.isApproved(): Boolean = this.status == 4

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/curseforge/models/CurseForgeProject.kt

@@ -86,4 +86,9 @@ class CurseForgeProject(
             )
         }
     }
-}
+}
+
+/**
+ * @return 该项目是否可见
+ */
+fun CurseForgeProject.isApproved(): Boolean = this.data.isApproved()

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/modrinth/ModrinthSearcher.kt

@@ -24,9 +24,11 @@ import com.movtery.zalithlauncher.game.download.assets.platform.PlatformClasses
 import com.movtery.zalithlauncher.game.download.assets.platform.PlatformSearchFilter
 import com.movtery.zalithlauncher.game.download.assets.platform.modrinth.models.ModrinthSingleProject
 import com.movtery.zalithlauncher.game.download.assets.platform.modrinth.models.ModrinthVersion
+import com.movtery.zalithlauncher.game.download.assets.platform.modrinth.models.isPublic
 import com.movtery.zalithlauncher.utils.network.httpGetJson
 import io.ktor.client.plugins.ClientRequestException
 import io.ktor.http.Parameters
+import io.ktor.server.plugins.NotFoundException
 import java.io.File
 
 class ModrinthSearcher(
@@ -51,9 +53,11 @@ class ModrinthSearcher(
     }
 
     override suspend fun getProject(projectID: String): ModrinthSingleProject {
-        return httpGetJson(
+        val project = httpGetJson<ModrinthSingleProject>(
             url = "$api/project/$projectID"
         )
+        if (!project.isPublic()) throw NotFoundException("The project {$projectID} is not in a publicly available state.")
+        return project
     }
 
     /**

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/game/download/assets/platform/modrinth/models/ModrinthSingleProject.kt

@@ -304,4 +304,14 @@ class ModrinthSingleProject(
             )
         }
     }
+}
+
+/**
+ * @return 该项目是否公开可见
+ */
+fun ModrinthSingleProject.isPublic(): Boolean {
+    return when (this.status) {
+        "approved", "archived" -> true
+        else -> false
+    }
 }