diff --git a/src/vi/cuutruyen/build.gradle b/src/vi/cuutruyen/build.gradle index 78b9659cc..78b838f98 100644 --- a/src/vi/cuutruyen/build.gradle +++ b/src/vi/cuutruyen/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Cứu Truyện' pkgNameSuffix = 'vi.cuutruyen' extClass = '.CuuTruyen' - extVersionCode = 2 + extVersionCode = 3 } -apply from: "$rootDir/common.gradle" \ No newline at end of file +apply from: "$rootDir/common.gradle" diff --git a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/CuuTruyenImageInterceptor.kt b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/CuuTruyenImageInterceptor.kt index 37eb0fdef..da07d7973 100644 --- a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/CuuTruyenImageInterceptor.kt +++ b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/CuuTruyenImageInterceptor.kt @@ -25,7 +25,10 @@ class CuuTruyenImageInterceptor : Interceptor { override fun intercept(chain: Interceptor.Chain): Response { val response = chain.proceed(chain.request()) - var drmData = chain.request().url.queryParameter(KEY) ?: return response + if (response.request.url.fragment?.contains(KEY) != true) { + return response + } + var drmData = response.request.url.fragment!!.substringAfter("$KEY=") drmData = drmData.replace("\n", "\\n") val image = unscrambleImage(response.body!!.byteStream(), drmData) diff --git a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/ChapterDto.kt b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/ChapterDto.kt index e5a6d9c04..05afce745 100644 --- a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/ChapterDto.kt +++ b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/ChapterDto.kt @@ -52,9 +52,10 @@ data class PageDto( ) { fun toPage(): Page { val dto = this@PageDto - val url = imageUrl.toHttpUrl().newBuilder().apply { - addQueryParameter(CuuTruyenImageInterceptor.KEY, dto.drmData) - }.build().toString() + val url = imageUrl.toHttpUrl().newBuilder() + .fragment("${CuuTruyenImageInterceptor.KEY}=$drmData") + .build() + .toString() return Page(dto.order, imageUrl = url) } } diff --git a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/MangaDto.kt b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/MangaDto.kt index c8f58e333..746c824d2 100644 --- a/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/MangaDto.kt +++ b/src/vi/cuutruyen/src/eu/kanade/tachiyomi/extension/vi/cuutruyen/dto/MangaDto.kt @@ -20,11 +20,11 @@ data class TeamDto( data class MangaDto( val id: Int, val name: String, - @SerialName("cover_url") val coverUrl: String, - @SerialName("cover_mobile_url") val coverMobileUrl: String, + @SerialName("cover_url") val coverUrl: String? = null, + @SerialName("cover_mobile_url") val coverMobileUrl: String? = null, val author: AuthorDto? = null, - val author_name: String? = null, + @SerialName("author_name") val authorName: String? = null, val description: String? = null, val team: TeamDto? = null, @@ -33,7 +33,7 @@ data class MangaDto( val dto = this@MangaDto url = "/mangas/${dto.id}" title = dto.name - author = dto.author?.name ?: dto.author_name + author = dto.author?.name ?: dto.authorName description = "" if (dto.team != null) {