Skip to content

Keep all JsonProperty for now #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luna712 merged 4 commits into from
Jun 18, 2026
Merged

Keep all JsonProperty for now #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c1e47b
Keep all JsonProperty for now
Luna712 Jun 18, 2026
676e92c
Keep all JsonProperty for now
Luna712 Jun 18, 2026
6a157f4
Keep all JsonProperty for now
Luna712 Jun 18, 2026
5b5e647
Keep all JsonProperty for now
Luna712 Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -50,23 +51,23 @@ class AniSkip : SkipAPI() {

@Serializable
data class AniSkipResponse(
@SerialName("found") val found: Boolean,
@SerialName("results") val results: List<Stamp>?,
@SerialName("message") val message: String?,
@SerialName("statusCode") val statusCode: Int,
@JsonProperty("found") @SerialName("found") val found: Boolean,
@JsonProperty("results") @SerialName("results") val results: List<Stamp>?,
@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,
)
}
}
61 changes: 31 additions & 30 deletions app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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<MyApiClient>,
@JsonProperty("myApiClients") @SerialName("myApiClients") val myApiClients: List<MyApiClient>,
)

@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? {
Expand Down Expand Up @@ -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<SearchShow>,
@JsonProperty("searchShows") @SerialName("searchShows") val searchShows: List<SearchShow>,
)

@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<Episode>,
@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<Episode>,
)

@Serializable
data class Episode(
@SerialName("number") val number: String?,
@SerialName("absoluteNumber") val absoluteNumber: String?,
@SerialName("season") val season: String?,
@SerialName("timestamps") val timestamps: List<Timestamp>,
@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<Timestamp>,
)

@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<String, Data> = ConcurrentHashMap()
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?,
)
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Stamp> = emptyList(),
@SerialName("recap") val recap: List<Stamp> = emptyList(),
@SerialName("credits") val credits: List<Stamp> = emptyList(),
@SerialName("preview") val preview: List<Stamp> = emptyList(),
@JsonProperty("type") @SerialName("type") val type: String,
@JsonProperty("intro") @SerialName("intro") val intro: List<Stamp> = emptyList(),
@JsonProperty("recap") @SerialName("recap") val recap: List<Stamp> = emptyList(),
@JsonProperty("credits") @SerialName("credits") val credits: List<Stamp> = emptyList(),
@JsonProperty("preview") @SerialName("preview") val preview: List<Stamp> = emptyList(),
)

@Serializable
Expand Down