From df3b2f29d691df433e5dcfcdc6bfa177174bc01b Mon Sep 17 00:00:00 2001 From: Riztard Lanthorn Date: Mon, 15 Feb 2021 11:01:59 +0700 Subject: [PATCH] Nsfw override (#5849) * Nsfw override * update version --- multisrc/overrides/madara/milftoon/src/Milftoon.kt | 2 ++ multisrc/overrides/madara/rawmangas/src/RawMangas.kt | 2 ++ multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt | 2 ++ multisrc/overrides/madara/toonily/src/Toonily.kt | 2 ++ .../overrides/madara/yaoitoshokan/src/YaoiToshokan.kt | 2 ++ .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 10 +++++----- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/multisrc/overrides/madara/milftoon/src/Milftoon.kt b/multisrc/overrides/madara/milftoon/src/Milftoon.kt index 8c9aee4a0..25e94eefa 100644 --- a/multisrc/overrides/madara/milftoon/src/Milftoon.kt +++ b/multisrc/overrides/madara/milftoon/src/Milftoon.kt @@ -1,9 +1,11 @@ package eu.kanade.tachiyomi.extension.en.milftoon import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import okhttp3.Request +@Nsfw class Milftoon : Madara("Milftoon", "https://milftoon.xxx", "en") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=views", headers) override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/page/$page/?m_orderby=latest", headers) diff --git a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt index b3714d74c..5f7233d86 100644 --- a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt +++ b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt @@ -1,7 +1,9 @@ package eu.kanade.tachiyomi.extension.ja.rawmangas import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw import java.text.SimpleDateFormat import java.util.Locale +@Nsfw class RawMangas : Madara("Raw Mangas", "https://rawmangas.net", "ja", SimpleDateFormat("MMMM dd, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt index 726606f9f..4da084841 100644 --- a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt +++ b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt @@ -1,7 +1,9 @@ package eu.kanade.tachiyomi.extension.tr.siyahmelek import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw import java.text.SimpleDateFormat import java.util.Locale +@Nsfw class Siyahmelek : Madara("Siyahmelek", "https://siyahmelek.com", "tr", SimpleDateFormat("dd MMM yyyy", Locale("tr"))) diff --git a/multisrc/overrides/madara/toonily/src/Toonily.kt b/multisrc/overrides/madara/toonily/src/Toonily.kt index 28ee3d605..00a07da32 100644 --- a/multisrc/overrides/madara/toonily/src/Toonily.kt +++ b/multisrc/overrides/madara/toonily/src/Toonily.kt @@ -1,7 +1,9 @@ package eu.kanade.tachiyomi.extension.en.toonily import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw +@Nsfw class Toonily : Madara("Toonily", "https://toonily.com", "en") { override fun getGenreList(): List = listOf( Genre("Action", "action-webtoon"), diff --git a/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt b/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt index 28d745a5b..6a54b93d2 100644 --- a/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt +++ b/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt @@ -1,6 +1,7 @@ package eu.kanade.tachiyomi.extension.pt.yaoitoshokan import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import okhttp3.Response @@ -8,6 +9,7 @@ import org.jsoup.nodes.Document import java.text.SimpleDateFormat import java.util.Locale +@Nsfw class YaoiToshokan : Madara("Yaoi Toshokan", "https://yaoitoshokan.com.br", "pt-BR", SimpleDateFormat("dd MMM yyyy", Locale("pt", "BR"))) { // Page has custom link to scan website. override val popularMangaUrlSelector = "div.post-title a:not([target])" 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 c83cee709..51b4eb435 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 @@ -153,7 +153,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Mark Scans", "https://markscans.online", "pt-BR"), SingleLang("Martial Scans", "https://martialscans.com", "en"), SingleLang("MG Komik", "https://mgkomik.my.id", "id"), - SingleLang("Milftoon", "https://milftoon.xxx", "en", isNsfw = true), + SingleLang("Milftoon", "https://milftoon.xxx", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Miracle Scans", "https://miraclescans.com", "en"), SingleLang("Mixed Manga", "https://mixedmanga.com", "en"), SingleLang("MMScans", "https://mm-scans.com/", "en"), @@ -181,7 +181,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("QueensManga ملكات المانجا", "https://queensmanga.com", "ar", className = "QueensManga"), SingleLang("Raider Scans", "https://raiderscans.com", "en"), SingleLang("Random Translations", "https://randomtranslations.com", "en"), - SingleLang("Raw Mangas", "https://rawmangas.net", "ja", isNsfw = true), + SingleLang("Raw Mangas", "https://rawmangas.net", "ja", isNsfw = true, overrideVersionCode = 1), SingleLang("ReadManhua", "https://readmanhua.net", "en", overrideVersionCode = 1), SingleLang("Renascence Scans (Renascans)", "https://new.renascans.com", "en", className = "RenaScans"), SingleLang("Rüya Manga", "https://www.ruyamanga.com", "tr", className = "RuyaManga"), @@ -189,7 +189,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Sekte Doujin", "https://sektedoujin.xyz", "id", isNsfw = true), SingleLang("ShoujoHearts", "http://shoujohearts.com", "en"), SingleLang("SiXiang Scans", "http://www.sixiangscans.com", "en"), - SingleLang("Siyahmelek", "https://siyahmelek.com", "tr", isNsfw = true), + SingleLang("Siyahmelek", "https://siyahmelek.com", "tr", isNsfw = true, overrideVersionCode = 1), SingleLang("Skymanga", "https://skymanga.co", "en"), SingleLang("SoloScanlation", "https://soloscanlation.site", "en"), SingleLang("Spooky Scanlations", "https://spookyscanlations.xyz", "es"), @@ -197,7 +197,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("TheTopComic", "https://thetopcomic.com", "en"), SingleLang("365Manga", "https://365manga.com", "en", className = "ThreeSixtyFiveManga"), SingleLang("ToonGod", "https://www.toongod.com", "en"), - SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, overrideVersionCode = 1), + SingleLang("Toonily", "https://toonily.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Toonily.net", "https://toonily.net", "en", isNsfw = true, className = "ToonilyNet"), SingleLang("ToonPoint", "https://toonpoint.com", "en"), SingleLang("Top Manhua", "https://topmanhua.com", "en"), @@ -219,7 +219,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("WoopRead", "https://woopread.com", "en"), SingleLang("World Romance Translation", "https://wrt.my.id/", "id"), SingleLang("WuxiaWorld", "https://wuxiaworld.site", "en"), - SingleLang("Yaoi Toshokan", "https://yaoitoshokan.com.br", "pt-BR", isNsfw = true), + SingleLang("Yaoi Toshokan", "https://yaoitoshokan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("Yokai Jump", "https://yokaijump.fr", "fr"), SingleLang("Yuri Verso", "https://yuri.live", "pt-BR"), SingleLang("Zin Translator", "https://zinmanga.com", "en"),