migrate to new auto skip api

Author: Him188

app/shared/app-data/src/commonMain/kotlin/data/network/AniApiProvider.kt

@@ -10,10 +10,10 @@
 package me.him188.ani.app.data.network
 
 import me.him188.ani.app.domain.foundation.ServerListFeatureConfig
-import me.him188.ani.client.apis.AutoSkipAniApi
 import me.him188.ani.client.apis.BangumiAniApi
 import me.him188.ani.client.apis.BangumiOAuthAniApi
 import me.him188.ani.client.apis.DanmakuAniApi
+import me.him188.ani.client.apis.EpisodesAniApi
 import me.him188.ani.client.apis.PeerFilterRuleAniApi
 import me.him188.ani.client.apis.ScheduleAniApi
 import me.him188.ani.client.apis.SubjectRelationsAniApi
@@ -37,7 +37,7 @@ class AniApiProvider(
     val subjectRelationsApi = ApiInvoker(client) { SubjectRelationsAniApi(baseurl, it) }
     val danmakuApi = ApiInvoker(client) { DanmakuAniApi(baseurl, it) }
     val pfRuleApi = ApiInvoker(client) { PeerFilterRuleAniApi(baseurl, it) }
-    val autoSkipApi = ApiInvoker(client) { AutoSkipAniApi(baseurl, it) }
+    val episodesApi = ApiInvoker(client) { EpisodesAniApi(baseurl, it) }
 
     val bangumiApi = ApiInvoker(client) { BangumiAniApi(baseurl, it) }
     val subjectApi = ApiInvoker(client) { SubjectsAniApi(baseurl, it) }

app/shared/app-data/src/commonMain/kotlin/data/network/AutoSkipRepository.kt

@@ -16,8 +16,8 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import me.him188.ani.app.data.repository.Repository
-import me.him188.ani.client.apis.AutoSkipAniApi
-import me.him188.ani.client.models.AutoSkipReportRequest
+import me.him188.ani.client.apis.EpisodesAniApi
+import me.him188.ani.client.models.AniReportAutoSkipRequest
 import me.him188.ani.utils.coroutines.IO_
 import me.him188.ani.utils.ktor.ApiInvoker
 import kotlin.coroutines.CoroutineContext
@@ -27,7 +27,7 @@ import kotlin.time.Clock
  * Client-side helper for AutoSkip reporting and querying rules.
  */
 class AutoSkipRepository(
-    private val api: ApiInvoker<AutoSkipAniApi>,
+    private val api: ApiInvoker<EpisodesAniApi>,
     private val ioDispatcher: CoroutineContext = Dispatchers.IO_,
 ) : Repository() {
 
@@ -38,17 +38,17 @@ class AutoSkipRepository(
      * Report a manual skip action.
      * Client-side throttling: at most 2 reports per episode, and at most once per 10 minutes per episode.
      */
-    suspend fun reportSkip(episodeId: Int, mediaSourceId: String, timeSeconds: Int) = lock.withLock {
+    suspend fun reportSkip(episodeId: Int, mediaSourceId: String, timeSeconds: Int, timeMillis: Long) = lock.withLock {
         val now = Clock.System.now().toEpochMilliseconds()
         val state = reportStates.getOrPut(episodeId) { EpisodeReportState(0, 0L) }
         if (state.count >= 2) return
         if (now - state.lastReportAt < TEN_MINUTES_MS) return
 
         withContext(ioDispatcher) {
             api {
-                reportSkip(
+                this.reportAutoSkip(
                     episodeId.toLong(),
-                    AutoSkipReportRequest(mediaSourceId = mediaSourceId, time = timeSeconds),
+                    AniReportAutoSkipRequest(mediaSourceId = mediaSourceId, time = timeSeconds, timeMs = timeMillis),
                 ).body()
             }
         }
@@ -59,9 +59,9 @@ class AutoSkipRepository(
     /**
      * Fetch autoskip rules for an episode. Emits once.
      */
-    fun rulesFlow(episodeId: Int): Flow<List<Int>> = flow {
+    fun rulesFlow(episodeId: Int): Flow<List<Long>> = flow {
         val rules = withContext(ioDispatcher) {
-            api { getAutoSkipRules(episodeId.toLong()).body().rules.map { it.time } }
+            api { this.getAutoSkipRules(episodeId.toLong()).body().rules.map { it.timeMs } }
         }
         emit(rules)
     }

app/shared/application/src/commonMain/kotlin/platform/CommonKoinModule.kt

@@ -331,7 +331,7 @@ private fun KoinApplication.otherModules(getContext: () -> Context, coroutineSco
     single<AnimeScheduleService> { AnimeScheduleService(get<AniApiProvider>().scheduleApi) }
     single<TrendsRepository> { TrendsRepository(get<AniApiProvider>().trendsApi, get<BangumiClient>().nextTrendingApi) }
     single<RecommendationRepository> { RecommendationRepository(get<TrendsRepository>()) }
-    single<AutoSkipRepository> { AutoSkipRepository(get<AniApiProvider>().autoSkipApi) }
+    single<AutoSkipRepository> { AutoSkipRepository(get<AniApiProvider>().episodesApi) }
 
     single<DanmakuManager> {
         DanmakuManager(

app/shared/src/commonMain/kotlin/ui/subject/episode/EpisodeViewModel.kt

@@ -669,7 +669,7 @@ class EpisodeViewModel(
             autoSkipRepository.rulesFlow(session.episodeId)
         }.combine(
             player.mediaProperties.mapNotNull { it?.durationMillis?.milliseconds },
-        ) { times, videoLength ->
+        ) { millisecondTimes, videoLength ->
             val durationMillis = when {
                 videoLength > 20.minutes -> 85_000L
                 videoLength > 10.minutes -> 55_000L
@@ -678,10 +678,10 @@ class EpisodeViewModel(
             if (durationMillis == 0L) {
                 emptyList()
             } else {
-                times.mapIndexed { index, t ->
-                    val name = if (times.size == 2) {
+                millisecondTimes.mapIndexed { index, t ->
+                    val name = if (millisecondTimes.size == 2) {
                         val anotherIndex = if (index == 0) 1 else 0
-                        if (t <= times[anotherIndex]) {
+                        if (t <= millisecondTimes[anotherIndex]) {
                             "OP"
                         } else {
                             "ED"
@@ -692,7 +692,7 @@ class EpisodeViewModel(
                     Chapter(
                         name,
                         durationMillis,
-                        t.toLong() * 1000L,
+                        t,
                     )
                 }
             }
@@ -943,7 +943,7 @@ class EpisodeViewModel(
                 logger.warn { "Refusing to report skip 85 at invalid time ${timeSeconds}s" }
                 return@launchInBackground
             }
-            autoSkipRepository.reportSkip(episodeId, mediaSourceId, timeSeconds)
+            autoSkipRepository.reportSkip(episodeId, mediaSourceId, timeSeconds, currentPositionMillis)
         }
     }
 

client/src/commonMain/kotlin/me/him188/ani/client/models/AutoSkipModels.kt

@@ -25,5 +25,6 @@ data class AutoSkipRules(
 data class AutoSkipReportRequest(
     val mediaSourceId: String,
     val time: Int,
+    val timeMillis: Long,
 )