Compare commits

..

No commits in common. "0430b85ecc196c286df02437d905a597e6ae8945" and "0cbd9099fd8b0071854ce2066ac28f275921e170" have entirely different histories.

5 changed files with 12 additions and 15 deletions

View File

@ -102,7 +102,6 @@ class Hikka(id: Long) : BaseTracker(id, "Hikka"), DeletableTracker {
}
override suspend fun bind(track: Track, hasReadChapters: Boolean): Track {
val readContent = api.getRead(track)
val remoteTrack = api.getManga(track)
track.copyPersonalFrom(remoteTrack)
@ -113,15 +112,7 @@ class Hikka(id: Long) : BaseTracker(id, "Hikka"), DeletableTracker {
track.status = if (!isRereading && hasReadChapters) READING else track.status
}
return if (readContent != null) {
track.score = readContent.score.toDouble()
track.last_chapter_read = readContent.chapters.toDouble()
track.score = readContent.score.toDouble()
update(track)
} else {
track.score = 0.0
update(track)
}
return update(track)
}
override suspend fun search(query: String): List<TrackSearch> {

View File

@ -97,7 +97,7 @@ class HikkaApi(
}
}
suspend fun getRead(track: Track): HKRead? {
private suspend fun getRead(track: Track): HKRead? {
return withIOContext {
val slug = track.tracking_url.split("/")[4]
val url = "$BASE_API_URL/read/manga/$slug".toUri().buildUpon().build()
@ -177,7 +177,7 @@ class HikkaApi(
private val authClient = client.newBuilder().addInterceptor(interceptor).build()
companion object {
const val BASE_API_URL = "https://api.hikka.io"
const val BASE_API_URL = "https://hikka.io/api"
const val BASE_URL = "https://hikka.io"
private const val SCOPE = "readlist,read:user-details"
private const val CLIENT_REFERENCE = "49eda83d-baa6-45f8-9936-b2a41d944da4"

View File

@ -29,6 +29,7 @@ data class HKManga(
title = this@HKManga.titleUa ?: this@HKManga.titleEn ?: this@HKManga.titleOriginal
total_chapters = this@HKManga.chapters?.toLong() ?: 0
cover_url = this@HKManga.image
summary = ""
score = this@HKManga.score
tracking_url = HikkaApi.BASE_URL + "/manga/${this@HKManga.slug}"
publishing_status = this@HKManga.status

View File

@ -10,8 +10,6 @@ data class HKOAuth(
val created: Long,
) {
fun isExpired(): Boolean {
val currentTime = System.currentTimeMillis() / 1000
val buffer = 5 * 60 // safety margin
return currentTime >= (expiration - buffer)
return (expiration - 43200) < (System.currentTimeMillis() / 1000)
}
}

View File

@ -5,5 +5,12 @@ import kotlinx.serialization.Serializable
@Serializable
data class HKUser(
val reference: String,
val updated: Long,
val created: Long,
val description: String,
val username: String,
val cover: String,
val active: Boolean,
val avatar: String,
val role: String,
)