From 8198cab8e2e51d331e055662c13866e0e30ba4cf Mon Sep 17 00:00:00 2001 From: Arraiment <76941874+Arraiment@users.noreply.github.com> Date: Mon, 6 Sep 2021 18:20:02 +0800 Subject: [PATCH] Madara fixes (#8973) * 1stKiss: Update domain * DragonTea: Update chapter endpoint * ItsYourRightManhua: Update chapter endpoint * NeatManga: Update chapter endpoint * TreeManga: Update chapter endpoint --- multisrc/overrides/madara/dragontea/src/DragonTea.kt | 4 +++- .../madara/firstkissmanga/src/FirstKissManga.kt | 2 +- .../itsyourrightmanhua/src/ItsYourRightManhua.kt | 7 +++++++ multisrc/overrides/madara/neatmanga/src/NeatManga.kt | 4 +++- multisrc/overrides/madara/treemanga/src/TreeManga.kt | 4 +++- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 10 +++++----- 6 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt diff --git a/multisrc/overrides/madara/dragontea/src/DragonTea.kt b/multisrc/overrides/madara/dragontea/src/DragonTea.kt index aa692d13b..c30942433 100644 --- a/multisrc/overrides/madara/dragontea/src/DragonTea.kt +++ b/multisrc/overrides/madara/dragontea/src/DragonTea.kt @@ -9,4 +9,6 @@ class DragonTea : Madara( "https://dragontea.ink/", "en", dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US) -) +) { + override val useNewChapterEndpoint = true +} diff --git a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt index da5e075b1..809b2bc88 100644 --- a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt +++ b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt @@ -3,6 +3,6 @@ package eu.kanade.tachiyomi.extension.en.firstkissmanga import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.Headers -class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.com", "en") { +class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.io", "en") { override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl) } diff --git a/multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt b/multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt new file mode 100644 index 000000000..d2fb81d91 --- /dev/null +++ b/multisrc/overrides/madara/itsyourrightmanhua/src/ItsYourRightManhua.kt @@ -0,0 +1,7 @@ +package eu.kanade.tachiyomi.extension.en.itsyourrightmanhua + +import eu.kanade.tachiyomi.multisrc.madara.Madara + +class ItsYourRightManhua : Madara("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en") { + override val useNewChapterEndpoint = true +} diff --git a/multisrc/overrides/madara/neatmanga/src/NeatManga.kt b/multisrc/overrides/madara/neatmanga/src/NeatManga.kt index aa9d7f20b..9ef39a44b 100644 --- a/multisrc/overrides/madara/neatmanga/src/NeatManga.kt +++ b/multisrc/overrides/madara/neatmanga/src/NeatManga.kt @@ -4,4 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class NeatManga : Madara("NeatManga", "https://neatmanga.com", "en", SimpleDateFormat("dd MMM yyyy", Locale.US)) +class NeatManga : Madara("NeatManga", "https://neatmanga.com", "en", SimpleDateFormat("dd MMM yyyy", Locale.US)) { + override val useNewChapterEndpoint = true +} diff --git a/multisrc/overrides/madara/treemanga/src/TreeManga.kt b/multisrc/overrides/madara/treemanga/src/TreeManga.kt index fe66b7317..6c2351fb0 100644 --- a/multisrc/overrides/madara/treemanga/src/TreeManga.kt +++ b/multisrc/overrides/madara/treemanga/src/TreeManga.kt @@ -9,4 +9,6 @@ class TreeManga : Madara( "https://treemanga.com", "en", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US) -) +) { + override val useNewChapterEndpoint: Boolean = true +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 06117f02c..c59731cd9 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -18,7 +18,7 @@ class MadaraGenerator : ThemeSourceGenerator { MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc"), MultiLang("Reaper Scans", "https://reaperscans.com", listOf("en", "pt-BR"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 2), SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove"), - SingleLang("1st Kiss", "https://1stkissmanga.com", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 5), + SingleLang("1st Kiss", "https://1stkissmanga.io", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 6), SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua", overrideVersionCode = 2), SingleLang("1stKissManga.Club", "https://1stkissmanga.club", "en", className = "FirstKissMangaClub"), SingleLang("247Manga", "https://247manga.com", "en", className = "Manga247"), @@ -69,7 +69,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Disaster Scans", "https://disasterscans.com", "en", overrideVersionCode = 1), SingleLang("Diskus Scan", "https://diskusscan.com", "pt-BR", overrideVersionCode = 1), SingleLang("DoujinHentai", "https://doujinhentai.net", "es", isNsfw = true, overrideVersionCode = 1), - SingleLang("DragonTea", "https://dragontea.ink/", "en", overrideVersionCode = 1), + SingleLang("DragonTea", "https://dragontea.ink/", "en", overrideVersionCode = 2), SingleLang("Dream Manga", "https://en.ruyamanga.com", "en", overrideVersionCode = 2), SingleLang("Drope Scan", "https://dropescan.com", "pt-BR", overrideVersionCode = 3), SingleLang("Dream Union Scan", "https://www.dreamunionscan.com", "pt-BR", overrideVersionCode = 1), @@ -126,7 +126,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Iris Scanlator", "https://irisscanlator.com", "pt-BR", isNsfw = true), SingleLang("IsekaiScan.com", "https://isekaiscan.com", "en", className = "IsekaiScanCom", overrideVersionCode = 4), SingleLang("IsekaiScanManga (unoriginal)", "https://isekaiscanmanga.com", "en", className = "IsekaiScanManga", overrideVersionCode = 1), - SingleLang("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en", overrideVersionCode = 1), + SingleLang("Its Your Right Manhua", "https://itsyourightmanhua.com/", "en", className = "ItsYourRightManhua", overrideVersionCode = 2), SingleLang("JaiminisBox.net", "https://jaiminisbox.net", "en", className = "Jaiminisboxnet"), SingleLang("Jiro Comics", "https://jirocomics.com", "en", isNsfw = true), SingleLang("Kami Sama Explorer", "https://kamisama.com.br", "pt-BR"), @@ -298,7 +298,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Mortals Groove", "https://mortalsgroove.com", "en"), SingleLang("Muctau", "https://muctau.com", "en"), SingleLang("Mystical Merries", "https://mysticalmerries.com", "en", overrideVersionCode = 1), - SingleLang("NeatManga", "https://neatmanga.com", "en", overrideVersionCode = 1), + SingleLang("NeatManga", "https://neatmanga.com", "en", overrideVersionCode = 2), SingleLang("NekoScan", "https://nekoscan.com", "en", overrideVersionCode = 2), SingleLang("NekoBreaker Scan", "https://nekobreakerscan.com", "pt-BR", overrideVersionCode = 1), SingleLang("Neox Scanlator", "https://neoxscans.net", "pt-BR", overrideVersionCode = 8), @@ -374,7 +374,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Toonily.net", "https://toonily.net", "en", isNsfw = true, className = "Toonilynet", overrideVersionCode = 2), SingleLang("ToonMany", "https://toonmany.com", "en", isNsfw = true), SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 1), - SingleLang("TreeManga", "https://treemanga.com", "en"), + SingleLang("TreeManga", "https://treemanga.com", "en", overrideVersionCode = 1), SingleLang("TritiniaScans", "https://tritinia.com", "en", overrideVersionCode = 1), SingleLang("Tsundoku Traduções", "https://tsundokutraducoes.com.br", "pt-BR", pkgName = "tsundokutraducoes", className = "TsundokuTraducoes", overrideVersionCode = 3), SingleLang("TuManga.net", "https://tumanga.net", "es", className = "TuMangaNet"),