diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index a3a74a415..c6e70b1ee 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'MangaDex' pkgNameSuffix = 'all.mangadex' extClass = '.MangaDexFactory' - extVersionCode = 188 + extVersionCode = 189 isNsfw = true } diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt index 4ee3a28cd..1a72db3bb 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt @@ -143,12 +143,19 @@ class MangaDexHelper(lang: String) { (MDConstants.latestChapterLimit * (page - 1)).toString() /** - * Remove any HTML characters in description or chapter name to actual - * characters. For example ♥ will show ♥. It also removes - * Markdown syntax for links, italic and bold. + * Remove any HTML characters in manga or chapter name to actual + * characters. For example ♥ will show ♥. + */ + private fun String.removeEntities(): String { + return Parser.unescapeEntities(this, false) + } + + /** + * Remove any HTML characters in description to actual characters. + * It also removes Markdown syntax for links, italic and bold. */ private fun String.removeEntitiesAndMarkdown(): String { - return Parser.unescapeEntities(this, false) + return removeEntities() .substringBefore("---") .replace(markdownLinksRegex, "$1") .replace(markdownItalicBoldRegex, "$1") @@ -284,7 +291,7 @@ class MangaDexHelper(lang: String) { ?: mangaDataDto.attributes.altTitles .find { (it[lang] ?: it["en"]) !== null } ?.values?.singleOrNull() // find something else from alt titles - title = dirtyTitle?.removeEntitiesAndMarkdown().orEmpty() + title = dirtyTitle?.removeEntities().orEmpty() coverFileName?.let { thumbnail_url = when (!coverSuffix.isNullOrEmpty()) { @@ -359,7 +366,7 @@ class MangaDexHelper(lang: String) { if (altTitles.isNotEmpty()) { val altTitlesDesc = altTitles .joinToString("\n", "${intl["alternative_titles"]}\n") { "• $it" } - desc += (if (desc.isBlank()) "" else "\n\n") + altTitlesDesc.removeEntitiesAndMarkdown() + desc += (if (desc.isBlank()) "" else "\n\n") + altTitlesDesc.removeEntities() } } @@ -427,7 +434,7 @@ class MangaDexHelper(lang: String) { return SChapter.create().apply { url = "/chapter/${chapterDataDto.id}" - name = chapterName.joinToString(" ").removeEntitiesAndMarkdown() + name = chapterName.joinToString(" ").removeEntities() date_upload = parseDate(attr.publishAt) scanlator = groups }