diff --git a/src/en/flamecomics/build.gradle b/src/en/flamecomics/build.gradle index 56d510926..f7152e3f5 100644 --- a/src/en/flamecomics/build.gradle +++ b/src/en/flamecomics/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Flame Comics' extClass = '.FlameComics' - extVersionCode = 41 + extVersionCode = 42 } apply from: "$rootDir/common.gradle" diff --git a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt index eaf23476c..44f7f6900 100644 --- a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt +++ b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt @@ -22,6 +22,7 @@ import okhttp3.Protocol import okhttp3.Request import okhttp3.Response import okhttp3.ResponseBody.Companion.toResponseBody +import org.jsoup.Jsoup import org.jsoup.nodes.Document import uy.kohesive.injekt.injectLazy import java.io.ByteArrayOutputStream @@ -42,7 +43,7 @@ class FlameComics : HttpSource() { .addInterceptor(::composedImageIntercept) .build() - private val removeSpecialCharsregex = Regex("[^A-Za-z0-9 ]") + private val removeSpecialCharsRegex = Regex("[^A-Za-z0-9 ]") private fun dataApiReqBuilder() = baseUrl.toHttpUrl().newBuilder().apply { addPathSegment("_next") @@ -70,7 +71,7 @@ class FlameComics : HttpSource() { GET( dataApiReqBuilder().apply { addPathSegment("browse.json") - fragment("$page&${removeSpecialCharsregex.replace(query.lowercase(), "")}") + fragment("$page&${removeSpecialCharsRegex.replace(query.lowercase(), "")}") }.build(), headers, ) @@ -100,10 +101,10 @@ class FlameComics : HttpSource() { titles += json.decodeFromString>(series.altTitles) } titles.any { title -> - removeSpecialCharsregex.replace( + removeSpecialCharsRegex.replace( query.lowercase(), "", - ) in removeSpecialCharsregex.replace( + ) in removeSpecialCharsRegex.replace( title.lowercase(), "", ) @@ -185,13 +186,14 @@ class FlameComics : HttpSource() { json.decodeFromString(response.body.string()).pageProps.series title = seriesData.title thumbnail_url = thumbnailUrl(seriesData) - description = seriesData.description + description = Jsoup.parseBodyFragment(seriesData.description).wholeText() genre = seriesData.tags?.let { tags -> (listOf(seriesData.type) + tags).joinToString() } ?: seriesData.type - author = seriesData.author + author = seriesData.author?.joinToString() + artist = seriesData.artist?.joinToString() status = when (seriesData.status.lowercase()) { "ongoing" -> SManga.ONGOING "dropped" -> SManga.CANCELLED diff --git a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComicsDto.kt b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComicsDto.kt index f44ba2c65..e47a513d6 100644 --- a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComicsDto.kt +++ b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComicsDto.kt @@ -72,7 +72,8 @@ class Series( val cover: String, val type: String, val tags: List?, - val author: String?, + val author: List?, + val artist: List?, val status: String, val series_id: Int, val last_edit: String,