diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt index a68399c6398..4bb78a1b0e8 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt @@ -1,5 +1,6 @@ package com.lagradost.cloudstream3.utils.videoskip +import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.AnimeLoadResponse import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId @@ -50,23 +51,23 @@ class AniSkip : SkipAPI() { @Serializable data class AniSkipResponse( - @SerialName("found") val found: Boolean, - @SerialName("results") val results: List?, - @SerialName("message") val message: String?, - @SerialName("statusCode") val statusCode: Int, + @JsonProperty("found") @SerialName("found") val found: Boolean, + @JsonProperty("results") @SerialName("results") val results: List?, + @JsonProperty("message") @SerialName("message") val message: String?, + @JsonProperty("statusCode") @SerialName("statusCode") val statusCode: Int, ) @Serializable data class Stamp( - @SerialName("interval") val interval: AniSkipInterval, - @SerialName("skipType") val skipType: String, - @SerialName("skipId") val skipId: String, - @SerialName("episodeLength") val episodeLength: Double, + @JsonProperty("interval") @SerialName("interval") val interval: AniSkipInterval, + @JsonProperty("skipType") @SerialName("skipType") val skipType: String, + @JsonProperty("skipId") @SerialName("skipId") val skipId: String, + @JsonProperty("episodeLength") @SerialName("episodeLength") val episodeLength: Double, ) @Serializable data class AniSkipInterval( - @SerialName("startTime") val startTime: Double, - @SerialName("endTime") val endTime: Double, + @JsonProperty("startTime") @SerialName("startTime") val startTime: Double, + @JsonProperty("endTime") @SerialName("endTime") val endTime: Double, ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt index 44713f673c2..df9d56217fd 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt @@ -1,5 +1,6 @@ package com.lagradost.cloudstream3.utils.videoskip +import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.AnimeLoadResponse import com.lagradost.cloudstream3.ErrorLoadingException import com.lagradost.cloudstream3.LoadResponse @@ -37,49 +38,49 @@ class AnimeSkipAuth : AuthAPI() { @Serializable data class LoginRoot( - @SerialName("data") val data: LoginData, + @JsonProperty("data") @SerialName("data") val data: LoginData, ) @Serializable data class LoginData( - @SerialName("login") val login: Login, + @JsonProperty("login") @SerialName("login") val login: Login, ) @Serializable data class Login( - @SerialName("authToken") val authToken: String, - @SerialName("refreshToken") val refreshToken: String, - @SerialName("account") val account: Account, + @JsonProperty("authToken") @SerialName("authToken") val authToken: String, + @JsonProperty("refreshToken") @SerialName("refreshToken") val refreshToken: String, + @JsonProperty("account") @SerialName("account") val account: Account, ) @Serializable data class ApiRoot( - @SerialName("data") val data: ApiData, + @JsonProperty("data") @SerialName("data") val data: ApiData, ) @Serializable data class ApiData( - @SerialName("myApiClients") val myApiClients: List, + @JsonProperty("myApiClients") @SerialName("myApiClients") val myApiClients: List, ) @Serializable data class MyApiClient( - @SerialName("id") val id: String, + @JsonProperty("id") @SerialName("id") val id: String, ) @Serializable data class Account( - @SerialName("profileUrl") val profileUrl: String, - @SerialName("username") val username: String, - @SerialName("email") val email: String, + @JsonProperty("profileUrl") @SerialName("profileUrl") val profileUrl: String, + @JsonProperty("username") @SerialName("username") val username: String, + @JsonProperty("email") @SerialName("email") val email: String, ) @Serializable data class Payload( - @SerialName("profileUrl") val profileUrl: String, - @SerialName("username") val username: String, - @SerialName("email") val email: String, - @SerialName("clientId") val clientId: String, + @JsonProperty("profileUrl") @SerialName("profileUrl") val profileUrl: String, + @JsonProperty("username") @SerialName("username") val username: String, + @JsonProperty("email") @SerialName("email") val email: String, + @JsonProperty("clientId") @SerialName("clientId") val clientId: String, ) override suspend fun user(token: AuthToken?): AuthUser? { @@ -183,41 +184,41 @@ class AnimeSkip : SkipAPI() { @Serializable data class Root( - @SerialName("data") val data: Data, + @JsonProperty("data") @SerialName("data") val data: Data, ) @Serializable data class Data( - @SerialName("searchShows") val searchShows: List, + @JsonProperty("searchShows") @SerialName("searchShows") val searchShows: List, ) @Serializable data class SearchShow( - @SerialName("name") val name: String, - @SerialName("originalName") val originalName: String?, - @SerialName("seasonCount") val seasonCount: Long, - @SerialName("episodeCount") val episodeCount: Long, - @SerialName("baseDuration") val baseDuration: Double, - @SerialName("episodes") val episodes: List, + @JsonProperty("name") @SerialName("name") val name: String, + @JsonProperty("originalName") @SerialName("originalName") val originalName: String?, + @JsonProperty("seasonCount") @SerialName("seasonCount") val seasonCount: Long, + @JsonProperty("episodeCount") @SerialName("episodeCount") val episodeCount: Long, + @JsonProperty("baseDuration") @SerialName("baseDuration") val baseDuration: Double, + @JsonProperty("episodes") @SerialName("episodes") val episodes: List, ) @Serializable data class Episode( - @SerialName("number") val number: String?, - @SerialName("absoluteNumber") val absoluteNumber: String?, - @SerialName("season") val season: String?, - @SerialName("timestamps") val timestamps: List, + @JsonProperty("number") @SerialName("number") val number: String?, + @JsonProperty("absoluteNumber") @SerialName("absoluteNumber") val absoluteNumber: String?, + @JsonProperty("season") @SerialName("season") val season: String?, + @JsonProperty("timestamps") @SerialName("timestamps") val timestamps: List, ) @Serializable data class Timestamp( - @SerialName("at") val at: Double, - @SerialName("type") val type: Type, + @JsonProperty("at") @SerialName("at") val at: Double, + @JsonProperty("type") @SerialName("type") val type: Type, ) @Serializable data class Type( - @SerialName("name") val name: String, + @JsonProperty("name") @SerialName("name") val name: String, ) val cache: ConcurrentHashMap = ConcurrentHashMap() diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt index ff367bcee9e..75e22a15f16 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt @@ -60,11 +60,11 @@ class IntroDbSkip : SkipAPI() { @Serializable data class IntroDbResponse( @JsonProperty("imdb_id") @SerialName("imdb_id") val imdbId: String?, - @SerialName("season") val season: Int?, - @SerialName("episode") val episode: Int?, - @SerialName("intro") val intro: Segment?, - @SerialName("recap") val recap: Segment?, - @SerialName("outro") val outro: Segment?, + @JsonProperty("season") @SerialName("season") val season: Int?, + @JsonProperty("episode") @SerialName("episode") val episode: Int?, + @JsonProperty("intro") @SerialName("intro") val intro: Segment?, + @JsonProperty("recap") @SerialName("recap") val recap: Segment?, + @JsonProperty("outro") @SerialName("outro") val outro: Segment?, ) @Serializable @@ -73,7 +73,7 @@ class IntroDbSkip : SkipAPI() { @JsonProperty("end_sec") @SerialName("end_sec") val endSec: Double?, @JsonProperty("start_ms") @SerialName("start_ms") val startMs: Long?, @JsonProperty("end_ms") @SerialName("end_ms") val endMs: Long?, - @SerialName("confidence") val confidence: Double?, + @JsonProperty("confidence") @SerialName("confidence") val confidence: Double?, @JsonProperty("submission_count") @SerialName("submission_count") val submissionCount: Int?, @JsonProperty("updated_at") @SerialName("updated_at") val updatedAt: String?, ) diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt index d6c3bc358d0..3fd050f1a5f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt @@ -57,11 +57,11 @@ class TheIntroDBSkip : SkipAPI() { @Serializable data class Root( @JsonProperty("tmdb_id") @SerialName("tmdb_id") val tmdbId: Long, - @SerialName("type") val type: String, - @SerialName("intro") val intro: List = emptyList(), - @SerialName("recap") val recap: List = emptyList(), - @SerialName("credits") val credits: List = emptyList(), - @SerialName("preview") val preview: List = emptyList(), + @JsonProperty("type") @SerialName("type") val type: String, + @JsonProperty("intro") @SerialName("intro") val intro: List = emptyList(), + @JsonProperty("recap") @SerialName("recap") val recap: List = emptyList(), + @JsonProperty("credits") @SerialName("credits") val credits: List = emptyList(), + @JsonProperty("preview") @SerialName("preview") val preview: List = emptyList(), ) @Serializable