From 6a75de9261bb60eaa05b358950d3f0fa32c74a51 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 4 Oct 2021 16:44:32 -0400 Subject: [PATCH] Remove usage of @Nsfw annotation in favor of extension-level flagging (#9368) --- .github/pull_request_template.md | 3 +-- CONTRIBUTING.md | 4 ++-- annotations/build.gradle.kts | 7 ------- annotations/src/main/kotlin/Nsfw.kt | 10 ---------- common-dependencies.gradle | 1 - common.gradle | 2 +- .../overrides/eromuse/eightmuses/src/EightMuses.kt | 2 -- multisrc/overrides/eromuse/erofus/src/Erofus.kt | 2 -- multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt | 2 -- .../fmreader/manhwa18net/src/Manhwa18NetFactory.kt | 3 --- .../foolslide/baixarhentai/src/BaixarHentai.kt | 2 -- .../overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt | 2 -- multisrc/overrides/gattsu/hentaikai/src/HentaiKai.kt | 2 -- .../overrides/gattsu/hentaiseason/src/HentaiSeason.kt | 2 -- .../gattsu/universohentai/src/UniversoHentai.kt | 2 -- .../overrides/madara/adonisfansub/src/AdonisFansub.kt | 2 -- .../overrides/madara/allporncomic/src/AllPornComic.kt | 2 -- .../madara/animecenterscan/src/AnimeCenterScan.kt | 2 -- .../madara/bananamecanica/src/BananaMecanica.kt | 2 -- .../overrides/madara/blmanhwaclub/src/BlManhwaClub.kt | 2 -- multisrc/overrides/madara/boyslove/src/BoysLove.kt | 2 -- .../overrides/madara/cafecomyaoi/src/CafeComYaoi.kt | 2 -- .../madara/decadencescans/src/DecadenceScans.kt | 2 -- .../overrides/madara/doujinhentai/src/DoujinHentai.kt | 2 -- multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt | 2 -- multisrc/overrides/madara/finalscans/src/FinalScans.kt | 2 -- .../overrides/madara/fleurblanche/src/FleurBlanche.kt | 2 -- multisrc/overrides/madara/freemanga/src/FreeManga.kt | 2 -- .../madara/fudidoscanlator/src/FudidoScanlator.kt | 2 -- .../overrides/madara/geasshentai/src/GeassHentai.kt | 2 -- multisrc/overrides/madara/gloryscans/src/GloryScans.kt | 2 -- multisrc/overrides/madara/hentai20/src/Hentai20.kt | 2 -- multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt | 2 -- .../overrides/madara/hentaimanga/src/HentaiManga.kt | 2 -- multisrc/overrides/madara/hentairead/src/Hentairead.kt | 2 -- .../madara/hentaiwebtoon/src/HentaiWebtoon.kt | 2 -- .../overrides/madara/hentaixcomic/src/HentaiXComic.kt | 2 -- .../overrides/madara/hentaixyuri/src/HentaiXYuri.kt | 2 -- multisrc/overrides/madara/hiperdex/src/Hiperdex.kt | 2 -- multisrc/overrides/madara/hm2d/src/HM2D.kt | 2 -- multisrc/overrides/madara/hmanhwa/src/hManhwa.kt | 2 -- multisrc/overrides/madara/ikifeng/src/Ikifeng.kt | 2 -- .../madara/irisscanlator/src/IrisScanlator.kt | 2 -- multisrc/overrides/madara/jirocomics/src/JiroComics.kt | 2 -- multisrc/overrides/madara/limascans/src/LimaScans.kt | 2 -- multisrc/overrides/madara/lolicon/src/Lolicon.kt | 2 -- multisrc/overrides/madara/madaradex/src/MadaraDex.kt | 2 -- multisrc/overrides/madara/mangacv/src/MangaCV.kt | 2 -- .../madara/mangadistrict/src/MangaDistrict.kt | 2 -- .../madara/mangaforfree/src/MangaForFreeFactory.kt | 2 -- .../madara/mangaforfreecom/src/Mangaforfreecom.kt | 2 -- .../overrides/madara/mangahentai/src/MangaHentai.kt | 2 -- multisrc/overrides/madara/mangahz/src/MangaHZ.kt | 2 -- multisrc/overrides/madara/mangakio/src/MangaKio.kt | 2 -- .../overrides/madara/mangakitsune/src/MangaKitsune.kt | 2 -- multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt | 2 -- multisrc/overrides/madara/mangapl/src/MangaPL.kt | 2 -- multisrc/overrides/madara/mangatuli/src/MangaTuli.kt | 2 -- multisrc/overrides/madara/mangceh/src/Mangceh.kt | 2 -- .../overrides/madara/manhwa18app/src/Manhwa18app.kt | 2 -- multisrc/overrides/madara/manhwa365/src/Manhwa365.kt | 2 -- multisrc/overrides/madara/manhwa68/src/Manhwa68.kt | 2 -- multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt | 2 -- .../madara/manhwahentaime/src/ManhwahentaiMe.kt | 2 -- .../overrides/madara/manhwuafans/src/Manhwuafans.kt | 2 -- multisrc/overrides/madara/manytoon/src/ManyToon.kt | 2 -- multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt | 2 -- multisrc/overrides/madara/megamangas/src/MegaMangas.kt | 2 -- multisrc/overrides/madara/mhentais/src/MHentais.kt | 2 -- .../madara/midnightmessscans/src/MidnightMessScans.kt | 2 -- multisrc/overrides/madara/milftoon/src/Milftoon.kt | 2 -- .../overrides/madara/neoxxxscans/src/NeoXXXScans.kt | 2 -- multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt | 2 -- .../madara/otksscanlator/src/OtksScanlator.kt | 2 -- multisrc/overrides/madara/pornwha/src/Pornwha.kt | 2 -- .../madara/rachelscanlator/src/RachelScanlator.kt | 2 -- multisrc/overrides/madara/rawmangas/src/RawMangas.kt | 2 -- multisrc/overrides/madara/readadult/src/ReadAdult.kt | 2 -- .../madara/scanlatorhunters/src/ScanlatorHunters.kt | 2 -- .../overrides/madara/seikouscans/src/SeikouScans.kt | 2 -- .../overrides/madara/sensainayuri/src/SensainaYuri.kt | 2 -- multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt | 2 -- multisrc/overrides/madara/skymanga/src/Skymanga.kt | 2 -- multisrc/overrides/madara/sodascan/src/SodaScan.kt | 2 -- .../src/SunshineButterflyScans.kt | 2 -- .../overrides/madara/tatakaescan/src/TatakaeScan.kt | 2 -- multisrc/overrides/madara/toongod/src/ToonGod.kt | 2 -- multisrc/overrides/madara/toonily/src/Toonily.kt | 2 -- multisrc/overrides/madara/toonilynet/src/Toonilynet.kt | 2 -- multisrc/overrides/madara/toonmany/src/ToonMany.kt | 2 -- .../madara/twentyfourhmanga/src/TwentyFourhManga.kt | 2 -- multisrc/overrides/madara/webtoon18/src/WebToon18.kt | 2 -- multisrc/overrides/madara/webtoon69/src/WebToon69.kt | 2 -- multisrc/overrides/madara/webtoonily/src/WebToonily.kt | 2 -- .../overrides/madara/webtoonscan/src/WebtoonScan.kt | 2 -- .../overrides/madara/webtoonstop/src/WebtoonsTOP.kt | 2 -- multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt | 2 -- multisrc/overrides/madara/xmanga/src/XManga.kt | 2 -- .../overrides/madara/yaoifanclube/src/YaoiFanClube.kt | 2 -- multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt | 2 -- multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt | 2 -- multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt | 2 -- multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt | 2 -- .../overrides/madara/yaoitoshokan/src/YaoiToshokan.kt | 2 -- .../overrides/mangasar/meusmangas/src/MeusMangas.kt | 2 -- multisrc/overrides/mmrcms/amascans/src/AmaScans.kt | 2 -- .../readerfront/ravensscans/src/RavensScansFactory.kt | 4 +--- .../overrides/wpmangareader/acescans/src/AceScans.kt | 2 -- .../dragontranslation/src/DragonTranslation.kt | 2 -- .../overrides/wpmangareader/mangasusu/src/Mangasusu.kt | 2 -- .../wpmangareader/patatescans/src/Patatescans.kt | 2 -- .../wpmangareader/sekaikomik/src/Sekaikomik.kt | 2 -- .../wpmangareader/silencescan/src/SilenceScan.kt | 2 -- .../wpmangastream/argoshentai/src/ArgosHentai.kt | 2 -- .../overrides/wpmangastream/hakaiscan/src/HakaiScan.kt | 2 -- .../wpmangastream/imaginescan/src/ImagineScan.kt | 2 -- .../wpmangastream/lemonjuicescan/src/LemonJuiceScan.kt | 2 -- .../overrides/wpmangastream/mihentai/src/Mihentai.kt | 2 -- .../wpmangastream/sektedoujin/src/SekteDoujin.kt | 2 -- .../src/main/java/generator/ThemeSourceGenerator.kt | 4 +--- settings.gradle.kts | 1 - src/all/batoto/build.gradle | 2 +- .../tachiyomi/extension/all/batoto/BatoToFactory.kt | 2 -- src/all/comickfun/build.gradle | 2 +- .../extension/all/comickfun/ComickFunFactory.kt | 2 -- src/all/ehentai/build.gradle | 2 +- .../tachiyomi/extension/all/ehentai/EHFactory.kt | 2 -- src/all/hentaihand/build.gradle | 2 +- .../tachiyomi/extension/all/hentaihand/HentaiHand.kt | 2 -- .../extension/all/hentaihand/HentaiHandFactory.kt | 2 -- src/all/hitomi/build.gradle | 2 +- .../tachiyomi/extension/all/hitomi/HitomiFactory.kt | 2 -- src/all/imhentai/build.gradle | 2 +- .../extension/all/imhentai/IMHentaiFactory.kt | 2 -- src/all/mangadex/build.gradle | 2 +- .../extension/all/mangadex/MangaDexFactory.kt | 2 -- src/all/mangapark/build.gradle | 2 +- .../extension/all/mangapark/MangaParkFactory.kt | 2 -- src/all/myreadingmanga/build.gradle | 2 +- .../all/myreadingmanga/MyReadingMangaFactory.kt | 2 -- src/all/nhentai/build.gradle | 2 +- .../tachiyomi/extension/all/nhentai/NHFactory.kt | 2 -- src/all/nhentaicom/build.gradle | 2 +- .../tachiyomi/extension/all/nhentaicom/NHentaiCom.kt | 2 -- .../extension/all/nhentaicom/NHentaiComFactory.kt | 2 -- src/all/ninehentai/build.gradle | 2 +- .../tachiyomi/extension/all/ninehentai/NineHentai.kt | 2 -- src/all/simplyhentai/build.gradle | 2 +- .../extension/all/simplyhentai/SimplyHentaiFactory.kt | 3 +-- src/all/tachidesk/build.gradle | 2 +- src/ar/gmanga/build.gradle | 2 +- src/ca/fansubscat/build.gradle | 2 +- src/en/bilibilicomics/build.gradle | 2 +- .../extension/en/bilibilicomics/BilibiliComics.kt | 2 -- src/en/brewingscans/build.gradle | 2 +- .../extension/en/brewingscans/BrewingScans.kt | 3 +-- src/en/doujins/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/doujins/Doujins.kt | 2 -- src/en/eggporncomics/build.gradle | 2 +- .../extension/en/eggporncomics/Eggporncomics.kt | 2 -- src/en/hbrowse/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt | 2 -- src/en/hentai2read/build.gradle | 2 +- .../tachiyomi/extension/en/hentai2read/Hentai2Read.kt | 2 -- src/en/hentaifox/build.gradle | 2 +- .../tachiyomi/extension/en/hentaifox/HentaiFox.kt | 2 -- src/en/hwtmanga/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/hwtmanga/HWTManga.kt | 3 +-- src/en/inkr/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/en/inkr/Inkr.kt | 2 -- src/en/latisbooks/build.gradle | 2 +- .../tachiyomi/extension/en/latisbooks/Latisbooks.kt | 2 -- src/en/lemonfont/build.gradle | 2 +- .../tachiyomi/extension/en/lemonfont/LemonFont.kt | 2 -- src/en/manga1s/build.gradle | 2 +- src/en/mangamiso/build.gradle | 2 +- .../tachiyomi/extension/en/mangamiso/MangaMiso.kt | 2 -- src/en/mangamutiny/build.gradle | 2 +- src/en/mangarawclub/build.gradle | 2 +- .../extension/en/mangarawclub/MangaRawClub.kt | 2 -- src/en/manhuamanga/build.gradle | 2 +- .../tachiyomi/extension/en/manhuamanga/ManhuaManga.kt | 2 -- src/en/manhwamanga/build.gradle | 2 +- .../tachiyomi/extension/en/manhwamanga/ManhwaManga.kt | 2 -- src/en/multporn/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/multporn/Multporn.kt | 2 -- src/en/myhentaicomics/build.gradle | 2 +- .../extension/en/myhentaicomics/MyHentaiComics.kt | 2 -- src/en/myhentaigallery/build.gradle | 2 +- .../extension/en/myhentaigallery/MyHentaiGallery.kt | 2 -- src/en/oglaf/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/en/oglaf/Oglaf.kt | 2 -- src/en/oots/build.gradle | 2 +- src/en/perveden/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/perveden/Perveden.kt | 2 -- src/en/pururin/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/pururin/Pururin.kt | 2 -- src/en/rainofsnow/build.gradle | 2 +- src/en/readmanhwa/build.gradle | 2 +- .../tachiyomi/extension/en/readmanhwa/ReadManhwa.kt | 2 -- src/en/toptoonplus/build.gradle | 2 +- .../tachiyomi/extension/en/toptoonplus/TopToonPlus.kt | 2 -- src/en/tsumino/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/tsumino/Tsumino.kt | 2 -- src/es/doujinyang/build.gradle | 2 +- .../tachiyomi/extension/es/doujinyang/DoujinYang.kt | 2 -- src/es/ikuhentai/build.gradle | 2 +- .../tachiyomi/extension/es/ikuhentai/Ikuhentai.kt | 2 -- src/es/leermangasxyz/build.gradle | 2 +- src/es/tmohentai/build.gradle | 2 +- .../tachiyomi/extension/es/tmohentai/TMOHentai.kt | 2 -- src/es/vcpvmp/build.gradle | 2 +- .../tachiyomi/extension/es/vcpvmp/VCPVMPFactory.kt | 2 -- src/fr/japanread/build.gradle | 2 +- src/fr/scanmanga/build.gradle | 2 +- src/it/digitalteam/build.gradle | 2 +- src/it/hentaifantasy/build.gradle | 2 +- .../extension/it/hentaifantasy/HentaiFantasy.kt | 2 -- src/it/mangaworld/build.gradle | 2 +- .../tachiyomi/extension/it/mangaworld/Mangaworld.kt | 2 -- src/it/perveden/build.gradle | 2 +- .../kanade/tachiyomi/extension/it/perveden/Perveden.kt | 2 -- src/pt/brmangas/build.gradle | 2 +- .../kanade/tachiyomi/extension/pt/brmangas/BrMangas.kt | 2 -- src/pt/hipercool/build.gradle | 2 +- .../tachiyomi/extension/pt/hipercool/Hipercool.kt | 2 -- src/pt/mangavibe/build.gradle | 2 +- .../tachiyomi/extension/pt/mangavibe/MangaVibe.kt | 2 -- src/pt/muitomanga/build.gradle | 2 +- .../tachiyomi/extension/pt/muitomanga/MuitoManga.kt | 2 -- src/pt/mundomangakun/build.gradle | 2 +- .../extension/pt/mundomangakun/MundoMangaKun.kt | 2 -- src/pt/taosect/build.gradle | 2 +- .../kanade/tachiyomi/extension/pt/taosect/TaoSect.kt | 2 -- src/ru/allhentai/build.gradle | 2 +- .../tachiyomi/extension/ru/allhentai/AllHentai.kt | 2 -- src/ru/henchan/build.gradle | 2 +- .../kanade/tachiyomi/extension/ru/henchan/Henchan.kt | 2 -- src/ru/nudemoon/build.gradle | 2 +- .../kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt | 2 -- src/ru/yaoichan/build.gradle | 2 +- .../kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt | 2 -- src/vi/hentaivn/build.gradle | 2 +- .../kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt | 2 -- src/zh/jinmantiantang/build.gradle | 2 +- .../extension/zh/jinmantiantang/Jinmantiantang.kt | 2 -- src/zh/wnacg/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt | 2 -- 248 files changed, 77 insertions(+), 441 deletions(-) delete mode 100644 annotations/build.gradle.kts delete mode 100644 annotations/src/main/kotlin/Nsfw.kt diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ecfd69021..5e2efbb8f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,8 +3,7 @@ Checklist: - [ ] Updated `extVersionCode` value in `build.gradle` for individual extensions - [ ] Updated `overrideVersionCode` or `baseVersionCode` as needed for all multisrc extensions - [ ] Referenced all related issues in the PR body (e.g. "Closes #xyz") -- [ ] Annotated `Source` or `SourceFactory` classes with `@Nsfw` when appropriate -- [ ] Added the `containsNsfw = true` flag in `build.gradle` when appropriate +- [ ] Added the `isNsfw = true` flag in `build.gradle` when appropriate - [ ] Have not changed source names - [ ] Have explicitly kept the `id` if a source's name or language were changed - [ ] Have tested the modifications by compiling and running the extension through Android Studio diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7e96846ef..ec6405151 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,7 +78,7 @@ ext { pkgNameSuffix = '.' extClass = '.' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" @@ -91,7 +91,7 @@ apply from: "$rootDir/common.gradle" | `extClass` | Points to the class that implements `Source`. You can use a relative path starting with a dot (the package name is the base path). This is used to find and instantiate the source(s). | | `extVersionCode` | The extension version code. This must be a positive integer and incremented with any change to the code. | | `libVersion` | (Optional, defaults to `1.2`) The version of the [extensions library](https://github.com/tachiyomiorg/extensions-lib) used. | -| `containsNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. | +| `isNsfw` | (Optional, defaults to `false`) Flag to indicate that a source contains NSFW content. | The extension's version name is generated automatically by concatenating `libVersion` and `extVersionCode`. With the example used above, the version would be `1.2.1`. diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts deleted file mode 100644 index 82482f1b3..000000000 --- a/annotations/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("kotlin") -} - -dependencies { - compileOnly(Dependencies.kotlin.stdlib) -} diff --git a/annotations/src/main/kotlin/Nsfw.kt b/annotations/src/main/kotlin/Nsfw.kt deleted file mode 100644 index ac899f043..000000000 --- a/annotations/src/main/kotlin/Nsfw.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.kanade.tachiyomi.annotations - -/** - * Annotation used to mark a Source (i.e. individual sources) or a SourceFactory (i.e. all sources - * within it) as NSFW. Used within the Tachiyomi app to prevent loading sources when parental - * controls are enabled. - */ -@Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.CLASS) -annotation class Nsfw diff --git a/common-dependencies.gradle b/common-dependencies.gradle index 5fda67310..019109f80 100644 --- a/common-dependencies.gradle +++ b/common-dependencies.gradle @@ -15,6 +15,5 @@ dependencies { compileOnly 'org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.2.0' compileOnly 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0' - implementation project(":annotations") compileOnly project(':duktape-stub') } diff --git a/common.gradle b/common.gradle index e598ce314..17dcf07fa 100644 --- a/common.gradle +++ b/common.gradle @@ -34,7 +34,7 @@ android { appName : "Tachiyomi: $extName", extClass: extClass, extFactory: project.ext.properties.getOrDefault("extFactory", ""), - nsfw: project.ext.properties.getOrDefault("containsNsfw", false) ? 1 : 0, + nsfw: project.ext.properties.getOrDefault("isNsfw", false) ? 1 : 0, ] } diff --git a/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt b/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt index c839bc169..c682addc9 100644 --- a/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt +++ b/multisrc/overrides/eromuse/eightmuses/src/EightMuses.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.eightmuses -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.eromuse.EroMuse import kotlin.ExperimentalStdlibApi @ExperimentalStdlibApi -@Nsfw class EightMuses : EroMuse("8Muses", "https://comics.8muses.com") diff --git a/multisrc/overrides/eromuse/erofus/src/Erofus.kt b/multisrc/overrides/eromuse/erofus/src/Erofus.kt index f604b9eb3..7c94e2487 100644 --- a/multisrc/overrides/eromuse/erofus/src/Erofus.kt +++ b/multisrc/overrides/eromuse/erofus/src/Erofus.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.erofus -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.eromuse.EroMuse import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList @@ -12,7 +11,6 @@ import okhttp3.Response import rx.Observable @ExperimentalStdlibApi -@Nsfw class Erofus : EroMuse("Erofus", "https://www.erofus.com") { override val albumSelector = "a.a-click" diff --git a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt index 50a7417fc..ff1240838 100644 --- a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt +++ b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.manhwa18 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.fmreader.FMReader import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Page import okhttp3.Request -@Nsfw class Manhwa18 : FMReader("Manhwa18", "https://manhwa18.com", "en") { override fun imageRequest(page: Page): Request { return if (page.imageUrl!!.contains("manhwa18")) { diff --git a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt index db68dcecc..e3e26a830 100644 --- a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt +++ b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.manhwa18net -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.fmreader.FMReader import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source @@ -15,7 +14,6 @@ class Manhwa18NetFactory : SourceFactory { ) } -@Nsfw class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=views&sort_type=DESC&ungenre=raw", headers) @@ -31,7 +29,6 @@ class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") { override fun getGenreList() = getAdultGenreList() } -@Nsfw class Manhwa18NetRaw : FMReader("Manhwa18.net", "https://manhwa18.net", "ko") { override val requestPath = "manga-list-genre-raw.html" override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { diff --git a/multisrc/overrides/foolslide/baixarhentai/src/BaixarHentai.kt b/multisrc/overrides/foolslide/baixarhentai/src/BaixarHentai.kt index 5fceba802..230b408af 100644 --- a/multisrc/overrides/foolslide/baixarhentai/src/BaixarHentai.kt +++ b/multisrc/overrides/foolslide/baixarhentai/src/BaixarHentai.kt @@ -1,14 +1,12 @@ package eu.kanade.tachiyomi.extension.pt.baixarhentai import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.foolslide.FoolSlide import eu.kanade.tachiyomi.source.model.SManga import org.jsoup.nodes.Document import java.util.concurrent.TimeUnit -@Nsfw class BaixarHentai : FoolSlide("Baixar Hentai", "https://leitura.baixarhentai.net", "pt-BR") { // Hardcode the id because the language wasn't specific. override val id = 8908032188831949972 diff --git a/multisrc/overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt b/multisrc/overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt index 2b06439c9..19619cec1 100644 --- a/multisrc/overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt +++ b/multisrc/overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.pt.hentaitokyo -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class HentaiTokyo : Gattsu( "Hentai Tokyo", "https://hentaitokyo.net", diff --git a/multisrc/overrides/gattsu/hentaikai/src/HentaiKai.kt b/multisrc/overrides/gattsu/hentaikai/src/HentaiKai.kt index 01b6f6f94..87dcc4a3d 100644 --- a/multisrc/overrides/gattsu/hentaikai/src/HentaiKai.kt +++ b/multisrc/overrides/gattsu/hentaikai/src/HentaiKai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.hentaikai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu import eu.kanade.tachiyomi.network.GET @@ -10,7 +9,6 @@ import okhttp3.Request import org.jsoup.nodes.Element import java.util.concurrent.TimeUnit -@Nsfw class HentaiKai : Gattsu( "Hentai Kai", "https://hentaikai.com", diff --git a/multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt b/multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt index b07a6ef7a..601056796 100644 --- a/multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt +++ b/multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.pt.hentaiseason -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class HentaiSeason : Gattsu( "Hentai Season", "https://hentaiseason.com", diff --git a/multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt b/multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt index 2a34f5790..7824cd2f6 100644 --- a/multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt +++ b/multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.universohentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu import eu.kanade.tachiyomi.source.model.SChapter @@ -12,7 +11,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.util.concurrent.TimeUnit -@Nsfw class UniversoHentai : Gattsu( "Universo Hentai", "https://universohentai.com", diff --git a/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt b/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt index 773c378bd..650964ab5 100644 --- a/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt +++ b/multisrc/overrides/madara/adonisfansub/src/AdonisFansub.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.tr.adonisfansub -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request -@Nsfw class AdonisFansub : Madara("Adonis Fansub", "https://manga.adonisfansub.com", "tr") { override val userAgentRandomizer = "" override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers) diff --git a/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt b/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt index 9b3c39300..2253bc0ef 100644 --- a/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt +++ b/multisrc/overrides/madara/allporncomic/src/AllPornComic.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.allporncomic -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request -@Nsfw class AllPornComic : Madara("AllPornComic", "https://allporncomic.com", "en") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers) override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=latest", headers) diff --git a/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt b/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt index 305c3dff6..ec5fe08f8 100644 --- a/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt +++ b/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.animecenterscan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class AnimeCenterScan : Madara( "Anime Center Scan", "https://animecenterscan.com", diff --git a/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt b/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt index accdd0774..6c35b2128 100644 --- a/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt +++ b/multisrc/overrides/madara/bananamecanica/src/BananaMecanica.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.bananamecanica -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class BananaMecanica : Madara( "Banana Mecânica", "https://leitorbm.com", diff --git a/multisrc/overrides/madara/blmanhwaclub/src/BlManhwaClub.kt b/multisrc/overrides/madara/blmanhwaclub/src/BlManhwaClub.kt index b63c31f1a..94c250d3c 100644 --- a/multisrc/overrides/madara/blmanhwaclub/src/BlManhwaClub.kt +++ b/multisrc/overrides/madara/blmanhwaclub/src/BlManhwaClub.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.blmanhwaclub -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class BlManhwaClub : Madara( "BL Manhwa Club", "https://blmanhwa.club", diff --git a/multisrc/overrides/madara/boyslove/src/BoysLove.kt b/multisrc/overrides/madara/boyslove/src/BoysLove.kt index 8fe9c1f4a..7ab8602cf 100644 --- a/multisrc/overrides/madara/boyslove/src/BoysLove.kt +++ b/multisrc/overrides/madara/boyslove/src/BoysLove.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.boyslove -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class BoysLove : Madara("BoysLove", "https://boyslove.me", "en") { override fun getGenreList() = listOf( diff --git a/multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt b/multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt index 3ec00d13b..5bc9d11e4 100644 --- a/multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt +++ b/multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.cafecomyaoi -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class CafeComYaoi : Madara( "Café com Yaoi", "http://cafecomyaoi.com.br", diff --git a/multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt b/multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt index cc64c9343..181d4a275 100644 --- a/multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt +++ b/multisrc/overrides/madara/decadencescans/src/DecadenceScans.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.decadencescans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class DecadenceScans : Madara("Decadence Scans", "https://reader.decadencescans.com", "en") { override val useNewChapterEndpoint: Boolean = true } diff --git a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt index 26e2b4f00..a8295600d 100644 --- a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt +++ b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.es.doujinhentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter @@ -12,7 +11,6 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class DoujinHentai : Madara("DoujinHentai", "https://doujinhentai.net", "es", SimpleDateFormat("d MMM. yyyy", Locale.ENGLISH)) { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/lista-manga-hentai?orderby=views&page=$page", headers) override fun popularMangaSelector() = "div.col-md-3 a" diff --git a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt index 969fd51e0..0a678384d 100644 --- a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt +++ b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.fastmanhwa -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.net", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { override val useNewChapterEndpoint = true } diff --git a/multisrc/overrides/madara/finalscans/src/FinalScans.kt b/multisrc/overrides/madara/finalscans/src/FinalScans.kt index d302a197e..f02dff5b8 100644 --- a/multisrc/overrides/madara/finalscans/src/FinalScans.kt +++ b/multisrc/overrides/madara/finalscans/src/FinalScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.finalscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class FinalScans : Madara( "Final Scans", "https://finalscans.com", diff --git a/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt b/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt index 5a79db1f3..c9222ac99 100644 --- a/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt +++ b/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.fleurblanche -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.Interceptor @@ -11,7 +10,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class FleurBlanche : Madara( "Fleur Blanche", "https://fleurscan.com", diff --git a/multisrc/overrides/madara/freemanga/src/FreeManga.kt b/multisrc/overrides/madara/freemanga/src/FreeManga.kt index 880db7d3f..ad4dd8082 100644 --- a/multisrc/overrides/madara/freemanga/src/FreeManga.kt +++ b/multisrc/overrides/madara/freemanga/src/FreeManga.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.freemanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class FreeManga : Madara("Free Manga", "https://freemanga.me", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/fudidoscanlator/src/FudidoScanlator.kt b/multisrc/overrides/madara/fudidoscanlator/src/FudidoScanlator.kt index f98085787..d34c1eb8d 100644 --- a/multisrc/overrides/madara/fudidoscanlator/src/FudidoScanlator.kt +++ b/multisrc/overrides/madara/fudidoscanlator/src/FudidoScanlator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.fudidoscanlator -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.MangasPage @@ -10,7 +9,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class FudidoScanlator : Madara( "Fudido Scanlator", "https://fudidoscan.com", diff --git a/multisrc/overrides/madara/geasshentai/src/GeassHentai.kt b/multisrc/overrides/madara/geasshentai/src/GeassHentai.kt index 3727ea6d5..c5bc9aeba 100644 --- a/multisrc/overrides/madara/geasshentai/src/GeassHentai.kt +++ b/multisrc/overrides/madara/geasshentai/src/GeassHentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.geasshentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class GeassHentai : Madara( "Geass Hentai", "https://geasshentai.xyz", diff --git a/multisrc/overrides/madara/gloryscans/src/GloryScans.kt b/multisrc/overrides/madara/gloryscans/src/GloryScans.kt index f7b1d2446..b01de37de 100644 --- a/multisrc/overrides/madara/gloryscans/src/GloryScans.kt +++ b/multisrc/overrides/madara/gloryscans/src/GloryScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.gloryscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class GloryScans : Madara( "Glory Scans", "https://gloryscan.com", diff --git a/multisrc/overrides/madara/hentai20/src/Hentai20.kt b/multisrc/overrides/madara/hentai20/src/Hentai20.kt index b00380ff1..1556432f3 100644 --- a/multisrc/overrides/madara/hentai20/src/Hentai20.kt +++ b/multisrc/overrides/madara/hentai20/src/Hentai20.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.hentai20 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class Hentai20 : Madara("Hentai20", "https://hentai20.com", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt b/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt index 5a47108d6..dc449a7cf 100644 --- a/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt +++ b/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.hentaidexy -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class Hentaidexy : Madara("Hentaidexy", "https://hentaidexy.com", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt b/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt index 4e3e4a2d7..6d175a2b2 100644 --- a/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt +++ b/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.hentaimanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HentaiManga : Madara( "Hentai Manga", "https://hentaimanga.me", diff --git a/multisrc/overrides/madara/hentairead/src/Hentairead.kt b/multisrc/overrides/madara/hentairead/src/Hentairead.kt index 5cc0b2fc9..128028cb2 100644 --- a/multisrc/overrides/madara/hentairead/src/Hentairead.kt +++ b/multisrc/overrides/madara/hentairead/src/Hentairead.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentairead -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt index e2e9ae800..e89af1563 100644 --- a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt +++ b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hentaiwebtoon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class HentaiWebtoon : Madara("HentaiWebtoon", "https://hentaiwebtoon.com", "en") diff --git a/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt b/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt index f39d35252..8aab57912 100644 --- a/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt +++ b/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.hentaixcomic -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HentaiXComic : Madara( "HentaiXComic", "https://hentaixcomic.com", diff --git a/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt b/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt index 113aeea17..e4c6b984c 100644 --- a/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt +++ b/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.hentaixyuri -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HentaiXYuri : Madara( "HentaiXYuri", "https://hentaixyuri.com", diff --git a/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt b/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt index 3717f6189..c9fba7577 100644 --- a/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt +++ b/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hiperdex -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Hiperdex : Madara("Hiperdex", "https://hiperdex.com", "en") { override fun getGenreList() = listOf( Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/hm2d/src/HM2D.kt b/multisrc/overrides/madara/hm2d/src/HM2D.kt index 16f5ba0e3..ccf4e1f61 100644 --- a/multisrc/overrides/madara/hm2d/src/HM2D.kt +++ b/multisrc/overrides/madara/hm2d/src/HM2D.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hm2d -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.SManga @@ -8,7 +7,6 @@ import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HM2D : Madara( "HM2D", "https://mangadistrict.com/hdoujin/", diff --git a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt index a587ed0e0..242c47f17 100644 --- a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt +++ b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.hmanhwa -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class hManhwa : Madara( "hManhwa", "https://hmanhwa.com", diff --git a/multisrc/overrides/madara/ikifeng/src/Ikifeng.kt b/multisrc/overrides/madara/ikifeng/src/Ikifeng.kt index 1e44d82e5..086f23f1f 100644 --- a/multisrc/overrides/madara/ikifeng/src/Ikifeng.kt +++ b/multisrc/overrides/madara/ikifeng/src/Ikifeng.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.es.ikifeng -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Ikifeng : Madara("Ikifeng", "https://ikifeng.com", "es", SimpleDateFormat("dd/MM/yyyy", Locale("es"))) diff --git a/multisrc/overrides/madara/irisscanlator/src/IrisScanlator.kt b/multisrc/overrides/madara/irisscanlator/src/IrisScanlator.kt index 63353a754..8c3b93cc6 100644 --- a/multisrc/overrides/madara/irisscanlator/src/IrisScanlator.kt +++ b/multisrc/overrides/madara/irisscanlator/src/IrisScanlator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.irisscanlator -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class IrisScanlator : Madara( "Iris Scanlator", "https://irisscanlator.com", diff --git a/multisrc/overrides/madara/jirocomics/src/JiroComics.kt b/multisrc/overrides/madara/jirocomics/src/JiroComics.kt index 7921eebd6..ab48a17e6 100644 --- a/multisrc/overrides/madara/jirocomics/src/JiroComics.kt +++ b/multisrc/overrides/madara/jirocomics/src/JiroComics.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.jirocomics -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SChapter import okhttp3.Response -@Nsfw class JiroComics : Madara("Jiro Comics", "https://jirocomics.com", "en") { override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() } diff --git a/multisrc/overrides/madara/limascans/src/LimaScans.kt b/multisrc/overrides/madara/limascans/src/LimaScans.kt index 29667c81d..11376c19c 100644 --- a/multisrc/overrides/madara/limascans/src/LimaScans.kt +++ b/multisrc/overrides/madara/limascans/src/LimaScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.limascans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET @@ -11,7 +10,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class LimaScans : Madara( "Lima Scans", "http://limascans.xyz/v2", diff --git a/multisrc/overrides/madara/lolicon/src/Lolicon.kt b/multisrc/overrides/madara/lolicon/src/Lolicon.kt index 8b2b37fbb..e92e9790d 100644 --- a/multisrc/overrides/madara/lolicon/src/Lolicon.kt +++ b/multisrc/overrides/madara/lolicon/src/Lolicon.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.lolicon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Lolicon : Madara("Lolicon", "https://lolicon.mobi", "en") diff --git a/multisrc/overrides/madara/madaradex/src/MadaraDex.kt b/multisrc/overrides/madara/madaradex/src/MadaraDex.kt index fbb449647..21d65ea69 100644 --- a/multisrc/overrides/madara/madaradex/src/MadaraDex.kt +++ b/multisrc/overrides/madara/madaradex/src/MadaraDex.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.madaradex -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MadaraDex : Madara( "MadaraDex", "https://madaradex.org", diff --git a/multisrc/overrides/madara/mangacv/src/MangaCV.kt b/multisrc/overrides/madara/mangacv/src/MangaCV.kt index 8810410ea..dd3651b2c 100644 --- a/multisrc/overrides/madara/mangacv/src/MangaCV.kt +++ b/multisrc/overrides/madara/mangacv/src/MangaCV.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangacv -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class MangaCV : Madara("MangaCV", "https://mangacv.com", "en") { override fun getGenreList() = listOf( diff --git a/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt b/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt index 8f0cf4160..244c10669 100644 --- a/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt +++ b/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.mangadistrict -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MangaDistrict : Madara( "Manga District", "https://mangadistrict.com", diff --git a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt index 3df10a0ed..33495a83f 100644 --- a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt +++ b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.mangaforfree -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.Source @@ -23,7 +22,6 @@ class MangaForFreeKO : MangaForFree("MangaForFree.net", "https://mangaforfree.ne } class MangaForFreeALL : MangaForFree("MangaForFree.net", "https://mangaforfree.net", "all") -@Nsfw abstract class MangaForFree( override val name: String, override val baseUrl: String, diff --git a/multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt b/multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt index 191eb5067..7297ae27f 100644 --- a/multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt +++ b/multisrc/overrides/madara/mangaforfreecom/src/Mangaforfreecom.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mangaforfreecom -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Mangaforfreecom : Madara("Mangaforfree.com", "https://mangaforfree.com", "en") diff --git a/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt b/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt index 980119868..808ed8298 100644 --- a/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt +++ b/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangahentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class MangaHentai : Madara("Manga Hentai", "https://mangahentai.me", "en") { override val useNewChapterEndpoint: Boolean = true } diff --git a/multisrc/overrides/madara/mangahz/src/MangaHZ.kt b/multisrc/overrides/madara/mangahz/src/MangaHZ.kt index 197b7b125..38425b85c 100644 --- a/multisrc/overrides/madara/mangahz/src/MangaHZ.kt +++ b/multisrc/overrides/madara/mangahz/src/MangaHZ.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangahz -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MangaHZ : Madara("MangaHZ", "https://www.mangahz.com", "en", dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/mangakio/src/MangaKio.kt b/multisrc/overrides/madara/mangakio/src/MangaKio.kt index caceb1d37..2b5435a32 100644 --- a/multisrc/overrides/madara/mangakio/src/MangaKio.kt +++ b/multisrc/overrides/madara/mangakio/src/MangaKio.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.mangakio -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MangaKio : Madara( "Manga Kio", "https://mangakio.com", diff --git a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt index c142e8996..a5468302b 100644 --- a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt +++ b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.en.mangakitsune -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SChapter import okhttp3.Response import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MangaKitsune : Madara("MangaKitsune", "https://mangakitsune.com", "en", dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)) { override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() diff --git a/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt b/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt index eb7f8e4a6..f73b2fca9 100644 --- a/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt +++ b/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mangamitsu -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class MangaMitsu : Madara("Manga Mitsu", "https://mangamitsu.com", "en") diff --git a/multisrc/overrides/madara/mangapl/src/MangaPL.kt b/multisrc/overrides/madara/mangapl/src/MangaPL.kt index 85b335c12..5d31048b2 100644 --- a/multisrc/overrides/madara/mangapl/src/MangaPL.kt +++ b/multisrc/overrides/madara/mangapl/src/MangaPL.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.mangapl -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class MangaPL : Madara("MangaPL", "https://mangapl.com", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt b/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt index 1401b9a5e..48940e8a3 100644 --- a/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt +++ b/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.mangatuli -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class MangaTuli : Madara("MangaTuli", "https://mangatuli.com", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/mangceh/src/Mangceh.kt b/multisrc/overrides/madara/mangceh/src/Mangceh.kt index 28314d5d7..608f262a6 100644 --- a/multisrc/overrides/madara/mangceh/src/Mangceh.kt +++ b/multisrc/overrides/madara/mangceh/src/Mangceh.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.id.mangceh -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Mangceh : Madara("Mangceh", "https://mangceh.me", "id") { override val useNewChapterEndpoint = true } diff --git a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt index 8a18f2ab2..17e5c32a0 100644 --- a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt +++ b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manhwa18app -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Manhwa18app : Madara("Manhwa18.app", "https://manhwa18.app", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt b/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt index f2e965dc1..35f8b6a67 100644 --- a/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt +++ b/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.manhwa365 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Manhwa365 : Madara( "Manhwa365", "https://manhwa365.com", diff --git a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt index 43d58a46d..82aa6def8 100644 --- a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt +++ b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.manhwa68 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Manhwa68 : Madara( "Manhwa68", "https://manhwa68.com", diff --git a/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt index 3da8e6c13..da1b94c9a 100644 --- a/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt +++ b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.en.manhwabiz -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Manhwabiz : Madara("Manhwa.biz", "https://manhwa.biz", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { private fun pagePath(page: Int) = if (page > 1) "page/$page/" else "" override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/all-manhwa/${pagePath(page)}?m_orderby=views", headers) diff --git a/multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt b/multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt index fa771f9ec..40421ac28 100644 --- a/multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt +++ b/multisrc/overrides/madara/manhwahentaime/src/ManhwahentaiMe.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manhwahentaime -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class ManhwahentaiMe : Madara("Manhwahentai.me", "https://manhwahentai.me", "en") { override val useNewChapterEndpoint: Boolean = true diff --git a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt index 848c028c8..17a2fcc49 100644 --- a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt +++ b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manhwuafans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Manhwuafans : Madara("Manhwua.fans", "https://manhwua.fans", "en", dateFormat = SimpleDateFormat("yyyy'年'M'月'd", Locale.US)) diff --git a/multisrc/overrides/madara/manytoon/src/ManyToon.kt b/multisrc/overrides/madara/manytoon/src/ManyToon.kt index a3d516333..2a8f1d6bf 100644 --- a/multisrc/overrides/madara/manytoon/src/ManyToon.kt +++ b/multisrc/overrides/madara/manytoon/src/ManyToon.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manytoon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class ManyToon : Madara("ManyToon", "https://manytoon.com", "en") { override val useNewChapterEndpoint: Boolean = true diff --git a/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt b/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt index 443bad9d7..d538ff1e1 100644 --- a/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt +++ b/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manytoonme -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class ManyToonMe : Madara("ManyToon.me", "https://manytoon.me", "en") { override val useNewChapterEndpoint: Boolean = true diff --git a/multisrc/overrides/madara/megamangas/src/MegaMangas.kt b/multisrc/overrides/madara/megamangas/src/MegaMangas.kt index b11b407cc..94102c9e6 100644 --- a/multisrc/overrides/madara/megamangas/src/MegaMangas.kt +++ b/multisrc/overrides/madara/megamangas/src/MegaMangas.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.megamangas -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class MegaMangas : Madara( "Mega Mangás", "https://megamanga.com.br", diff --git a/multisrc/overrides/madara/mhentais/src/MHentais.kt b/multisrc/overrides/madara/mhentais/src/MHentais.kt index 71555417c..df70b2543 100644 --- a/multisrc/overrides/madara/mhentais/src/MHentais.kt +++ b/multisrc/overrides/madara/mhentais/src/MHentais.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.mhentais -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class MHentais : Madara( "MHentais", "https://mhentais.com", diff --git a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt index 21e0af904..241d53dc8 100644 --- a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt +++ b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.midnightmessscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SManga import org.jsoup.nodes.Document import java.util.Locale -@Nsfw class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.org", "en") { override fun mangaDetailsParse(document: Document): SManga { diff --git a/multisrc/overrides/madara/milftoon/src/Milftoon.kt b/multisrc/overrides/madara/milftoon/src/Milftoon.kt index 9b9ae7c7f..8c9aee4a0 100644 --- a/multisrc/overrides/madara/milftoon/src/Milftoon.kt +++ b/multisrc/overrides/madara/milftoon/src/Milftoon.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.milftoon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara 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/neoxxxscans/src/NeoXXXScans.kt b/multisrc/overrides/madara/neoxxxscans/src/NeoXXXScans.kt index 902b34a24..6bbe4f07b 100644 --- a/multisrc/overrides/madara/neoxxxscans/src/NeoXXXScans.kt +++ b/multisrc/overrides/madara/neoxxxscans/src/NeoXXXScans.kt @@ -6,7 +6,6 @@ import android.widget.Toast import androidx.preference.EditTextPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.BuildConfig -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.ConfigurableSource @@ -17,7 +16,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class NeoXXXScans : Madara( "NeoXXX Scans", diff --git a/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt b/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt index 84689231f..43681f145 100644 --- a/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt +++ b/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.ohnomanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class OhNoManga : Madara("Oh No Manga", "https://ohnomanga.com", "en") diff --git a/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt b/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt index ec89ef465..003cdd66d 100644 --- a/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt +++ b/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.otksscanlator -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class OtksScanlator : Madara( "OTksScanlator", "https://otkscanlator.xyz", diff --git a/multisrc/overrides/madara/pornwha/src/Pornwha.kt b/multisrc/overrides/madara/pornwha/src/Pornwha.kt index da63f28ac..008d16ac7 100644 --- a/multisrc/overrides/madara/pornwha/src/Pornwha.kt +++ b/multisrc/overrides/madara/pornwha/src/Pornwha.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.pornwha -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Pornwha : Madara("Pornwha", "https://pornwha.com", "en") diff --git a/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt b/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt index f79ecead0..e79edf9e1 100644 --- a/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt +++ b/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.rachelscanlator -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class RachelScanlator : Madara( "Rachel Scanlator", "https://rachelscanlator.com", diff --git a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt index 98886139e..b3714d74c 100644 --- a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt +++ b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.ja.rawmangas -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara 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/readadult/src/ReadAdult.kt b/multisrc/overrides/madara/readadult/src/ReadAdult.kt index a279a6f3c..f651c5cfc 100644 --- a/multisrc/overrides/madara/readadult/src/ReadAdult.kt +++ b/multisrc/overrides/madara/readadult/src/ReadAdult.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.readadult -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class ReadAdult : Madara("Read Adult", "https://readadult.net", "en") diff --git a/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt b/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt index 35857b23c..0c6e7a81f 100644 --- a/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt +++ b/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.scanlatorhunters -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class ScanlatorHunters : Madara( "Scanlator Hunters", "https://scanlatorhunters.xyz", diff --git a/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt b/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt index dce70bbf1..2b8c661c5 100644 --- a/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt +++ b/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.seikouscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class SeikouScans : Madara( "Seikou Scans", "https://seikouscans.com", diff --git a/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt b/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt index 8097d2918..6039b874b 100644 --- a/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt +++ b/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.sensainayuri -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class SensainaYuri : Madara( "Sensaina Yuri", "https://sensainayuri.dropescan.com", diff --git a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt index 29ea9b38a..9d337eafc 100644 --- a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt +++ b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.tr.siyahmelek -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Siyahmelek : Madara("Siyahmelek", "https://siyahmelek.net", "tr", SimpleDateFormat("dd MMM yyyy", Locale("tr"))) diff --git a/multisrc/overrides/madara/skymanga/src/Skymanga.kt b/multisrc/overrides/madara/skymanga/src/Skymanga.kt index ea7c1ccb0..071293f1b 100644 --- a/multisrc/overrides/madara/skymanga/src/Skymanga.kt +++ b/multisrc/overrides/madara/skymanga/src/Skymanga.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.skymanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Skymanga : Madara("Skymanga", "https://skymanga.co", "en") diff --git a/multisrc/overrides/madara/sodascan/src/SodaScan.kt b/multisrc/overrides/madara/sodascan/src/SodaScan.kt index c53413c7e..2346b9bc3 100644 --- a/multisrc/overrides/madara/sodascan/src/SodaScan.kt +++ b/multisrc/overrides/madara/sodascan/src/SodaScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.sodascan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class SodaScan : Madara( "SodaScan", "https://sodascan.xyz", diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt b/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt index 4e0560e96..0cb42b19d 100644 --- a/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt +++ b/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.sunshinebutterflyscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class SunshineButterflyScans : Madara("Sunshine Butterfly Scans", "https://sunshinebutterflyscan.com", "en") diff --git a/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt b/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt index 793971046..a97c8daf7 100644 --- a/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt +++ b/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.tatakaescan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class TatakaeScan : Madara( "Tatakae Scan", "https://tatakaescan.xyz", diff --git a/multisrc/overrides/madara/toongod/src/ToonGod.kt b/multisrc/overrides/madara/toongod/src/ToonGod.kt index 93d8cd75f..a3f78d090 100644 --- a/multisrc/overrides/madara/toongod/src/ToonGod.kt +++ b/multisrc/overrides/madara/toongod/src/ToonGod.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.toongod -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class ToonGod : Madara("ToonGod", "https://www.toongod.com", "en", SimpleDateFormat("dd MMM yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/toonily/src/Toonily.kt b/multisrc/overrides/madara/toonily/src/Toonily.kt index 406c1885c..ae8493833 100644 --- a/multisrc/overrides/madara/toonily/src/Toonily.kt +++ b/multisrc/overrides/madara/toonily/src/Toonily.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.toonily -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Toonily : Madara("Toonily", "https://toonily.com", "en") { override fun getGenreList(): List = listOf( Genre("Action", "action-webtoon"), diff --git a/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt index 852c8b19e..2d81a24db 100644 --- a/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt +++ b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.toonilynet -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class Toonilynet : Madara("Toonily.net", "https://toonily.net", "en") diff --git a/multisrc/overrides/madara/toonmany/src/ToonMany.kt b/multisrc/overrides/madara/toonmany/src/ToonMany.kt index 56d4156cf..a2128f8de 100644 --- a/multisrc/overrides/madara/toonmany/src/ToonMany.kt +++ b/multisrc/overrides/madara/toonmany/src/ToonMany.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.toonmany -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class ToonMany : Madara("ToonMany", "https://toonmany.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt b/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt index 62db64fc1..081a346b1 100644 --- a/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt +++ b/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.twentyfourhmanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class TwentyFourhManga : Madara("24hManga", "https://24hmanga.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt index 95de4b3d5..4f5207242 100644 --- a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt +++ b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.webtoon18 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class WebToon18 : Madara("WebToon18", "http://webtoon18.net", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/webtoon69/src/WebToon69.kt b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt index 8c06f2ac9..841684141 100644 --- a/multisrc/overrides/madara/webtoon69/src/WebToon69.kt +++ b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.webtoon69 -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class WebToon69 : Madara("WebToon69", "https://webtoon69.com", "en") diff --git a/multisrc/overrides/madara/webtoonily/src/WebToonily.kt b/multisrc/overrides/madara/webtoonily/src/WebToonily.kt index f44f6841d..2d402b46e 100644 --- a/multisrc/overrides/madara/webtoonily/src/WebToonily.kt +++ b/multisrc/overrides/madara/webtoonily/src/WebToonily.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.webtoonily -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class WebToonily : Madara("WebToonily", "https://www.webtoonily.com", "en") diff --git a/multisrc/overrides/madara/webtoonscan/src/WebtoonScan.kt b/multisrc/overrides/madara/webtoonscan/src/WebtoonScan.kt index 5d84da2dd..601542d54 100644 --- a/multisrc/overrides/madara/webtoonscan/src/WebtoonScan.kt +++ b/multisrc/overrides/madara/webtoonscan/src/WebtoonScan.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.webtoonscan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class WebtoonScan : Madara("WebtoonScan", "https://webtoonscan.com", "en") diff --git a/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt b/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt index 5c61f8e57..7b26b7e28 100644 --- a/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt +++ b/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.webtoonstop -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class WebtoonsTOP : Madara( "WebtoonsTOP", "https://webtoons.top", diff --git a/multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt b/multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt index 365528adc..0923594d3 100644 --- a/multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt +++ b/multisrc/overrides/madara/webtoonxyz/src/WebtoonXYZ.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.en.webtoonxyz -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class WebtoonXYZ : Madara("WebtoonXYZ", "https://www.webtoon.xyz", "en", SimpleDateFormat("dd MMMM yyyy", Locale.US)) { private fun pagePath(page: Int) = if (page > 1) "page/$page/" else "" override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/webtoons/${pagePath(page)}?m_orderby=views", headers) diff --git a/multisrc/overrides/madara/xmanga/src/XManga.kt b/multisrc/overrides/madara/xmanga/src/XManga.kt index 19739acd4..7e2316892 100644 --- a/multisrc/overrides/madara/xmanga/src/XManga.kt +++ b/multisrc/overrides/madara/xmanga/src/XManga.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.xmanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class XManga : Madara("XManga", "https://xmanga.io", "en") diff --git a/multisrc/overrides/madara/yaoifanclube/src/YaoiFanClube.kt b/multisrc/overrides/madara/yaoifanclube/src/YaoiFanClube.kt index ca69e6ef8..d316b0b46 100644 --- a/multisrc/overrides/madara/yaoifanclube/src/YaoiFanClube.kt +++ b/multisrc/overrides/madara/yaoifanclube/src/YaoiFanClube.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.yaoifanclube -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class YaoiFanClube : Madara( "Yaoi Fan Clube", "https://yaoifanclube.com.br", diff --git a/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt b/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt index dc0f33394..a47350c72 100644 --- a/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt +++ b/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.yaoihentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class YaoiHentai : Madara("Yaoi Hentai", "https://yaoihentai.me", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt b/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt index a7be92bc3..647d8d2fa 100644 --- a/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt +++ b/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt @@ -1,12 +1,10 @@ package eu.kanade.tachiyomi.extension.en.yaoimanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit -@Nsfw class YaoiManga : Madara("Yaoi.mobi", "https://yaoi.mobi", "en") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt b/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt index 38c274a12..7aa672694 100644 --- a/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt +++ b/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.yaoiscan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara -@Nsfw class YaoiScan : Madara("YaoiScan", "https://yaoiscan.com", "en") diff --git a/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt b/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt index ddbebeba4..704045667 100644 --- a/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt +++ b/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.yaoitoon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class YaoiToon : Madara("YaoiToon", "https://yaoitoon.com", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt b/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt index 1ff6d9b2e..0505731af 100644 --- a/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt +++ b/multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.yaoitoshokan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.Page @@ -10,7 +9,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class YaoiToshokan : Madara( "Yaoi Toshokan", "https://yaoitoshokan.net", diff --git a/multisrc/overrides/mangasar/meusmangas/src/MeusMangas.kt b/multisrc/overrides/mangasar/meusmangas/src/MeusMangas.kt index 8c443ff53..2acb70232 100644 --- a/multisrc/overrides/mangasar/meusmangas/src/MeusMangas.kt +++ b/multisrc/overrides/mangasar/meusmangas/src/MeusMangas.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.meusmangas -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangasar.MangaSar import eu.kanade.tachiyomi.source.model.SManga @@ -10,7 +9,6 @@ import okhttp3.Response import org.jsoup.nodes.Element import java.util.concurrent.TimeUnit -@Nsfw class MeusMangas : MangaSar( "Meus Mangás", "https://meusmangas.net", diff --git a/multisrc/overrides/mmrcms/amascans/src/AmaScans.kt b/multisrc/overrides/mmrcms/amascans/src/AmaScans.kt index ae27f1554..3d468b4de 100644 --- a/multisrc/overrides/mmrcms/amascans/src/AmaScans.kt +++ b/multisrc/overrides/mmrcms/amascans/src/AmaScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.amascans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mmrcms.MMRCMS import eu.kanade.tachiyomi.network.GET @@ -9,7 +8,6 @@ import okhttp3.OkHttpClient import okhttp3.Request import java.util.concurrent.TimeUnit -@Nsfw class AmaScans : MMRCMS("Ama Scans", "https://amascan.com", "pt-BR") { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt b/multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt index 2ee842a45..27c54d5ff 100644 --- a/multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt +++ b/multisrc/overrides/readerfront/ravensscans/src/RavensScansFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.ravensscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.readerfront.ReaderFront import eu.kanade.tachiyomi.source.SourceFactory @@ -10,8 +9,7 @@ class RavensScansFactory : SourceFactory { RavensScans("en", 2) ) - @Nsfw - class RavensScans(override val lang: String, override val langId: Int) : + class RavensScans(override val lang: String, override val langId: Int) : ReaderFront("Ravens Scans", "https://ravens-scans.com/", lang, langId) { override fun getImageCDN(path: String, width: Int) = "https://i${(0..2).random()}.wp.com/img-cdn1.ravens-scans.com" + diff --git a/multisrc/overrides/wpmangareader/acescans/src/AceScans.kt b/multisrc/overrides/wpmangareader/acescans/src/AceScans.kt index 58284a10a..c713f7801 100644 --- a/multisrc/overrides/wpmangareader/acescans/src/AceScans.kt +++ b/multisrc/overrides/wpmangareader/acescans/src/AceScans.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.en.acescans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader -@Nsfw class AceScans : WPMangaReader("Ace Scans", "https://acescans.xyz", "en") diff --git a/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt b/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt index b78cc33b3..444cb83f0 100644 --- a/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt +++ b/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.es.dragontranslation -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class DragonTranslation : WPMangaReader( "DragonTranslation", "https://dragontranslation.com", diff --git a/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt b/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt index 868a32af0..c143658b8 100644 --- a/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt +++ b/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.id.mangasusu -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader -@Nsfw class Mangasusu : WPMangaReader("Mangasusu", "https://mangasusu.co.in", "id", "/komik") diff --git a/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt b/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt index 563ec9a45..fb87a7d7b 100644 --- a/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt +++ b/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.fr.patatescans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader -@Nsfw class Patatescans : WPMangaReader("Patatescans", "https://patatescans.com", "fr") diff --git a/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt b/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt index 8ad7fa804..622551eff 100644 --- a/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt +++ b/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.id.sekaikomik -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Sekaikomik : WPMangaReader("Sekaikomik", "https://www.sekaikomik.site", "id", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id"))) diff --git a/multisrc/overrides/wpmangareader/silencescan/src/SilenceScan.kt b/multisrc/overrides/wpmangareader/silencescan/src/SilenceScan.kt index 2c31e1385..24bc1fad8 100644 --- a/multisrc/overrides/wpmangareader/silencescan/src/SilenceScan.kt +++ b/multisrc/overrides/wpmangareader/silencescan/src/SilenceScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.silencescan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import eu.kanade.tachiyomi.source.model.SManga @@ -9,7 +8,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class SilenceScan : WPMangaReader( "Silence Scan", "https://silencescan.com.br", diff --git a/multisrc/overrides/wpmangastream/argoshentai/src/ArgosHentai.kt b/multisrc/overrides/wpmangastream/argoshentai/src/ArgosHentai.kt index 7650dd11d..795117a68 100644 --- a/multisrc/overrides/wpmangastream/argoshentai/src/ArgosHentai.kt +++ b/multisrc/overrides/wpmangastream/argoshentai/src/ArgosHentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.argoshentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class ArgosHentai : WPMangaStream( "Argos Hentai", "https://agshentai.com", diff --git a/multisrc/overrides/wpmangastream/hakaiscan/src/HakaiScan.kt b/multisrc/overrides/wpmangastream/hakaiscan/src/HakaiScan.kt index d46fc84af..3a1bc0f5a 100644 --- a/multisrc/overrides/wpmangastream/hakaiscan/src/HakaiScan.kt +++ b/multisrc/overrides/wpmangastream/hakaiscan/src/HakaiScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.hakaiscan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class HakaiScan : WPMangaStream( "Hakai Scan", "http://hakaiscan.xyz", diff --git a/multisrc/overrides/wpmangastream/imaginescan/src/ImagineScan.kt b/multisrc/overrides/wpmangastream/imaginescan/src/ImagineScan.kt index 6e1d909f9..787d7842f 100644 --- a/multisrc/overrides/wpmangastream/imaginescan/src/ImagineScan.kt +++ b/multisrc/overrides/wpmangastream/imaginescan/src/ImagineScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.imaginescan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class ImagineScan : WPMangaStream( "Imagine Scan", "https://imaginescan.com.br", diff --git a/multisrc/overrides/wpmangastream/lemonjuicescan/src/LemonJuiceScan.kt b/multisrc/overrides/wpmangastream/lemonjuicescan/src/LemonJuiceScan.kt index 4bbb9615d..d6677a3a8 100644 --- a/multisrc/overrides/wpmangastream/lemonjuicescan/src/LemonJuiceScan.kt +++ b/multisrc/overrides/wpmangastream/lemonjuicescan/src/LemonJuiceScan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.lemonjuicescan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class LemonJuiceScan : WPMangaStream( "Lemon Juice Scan", "https://lemonjuicescan.com", diff --git a/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt b/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt index 0b2a4c4c4..1eeaba59b 100644 --- a/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt +++ b/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mihentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter @@ -17,7 +16,6 @@ import org.jsoup.nodes.Document import uy.kohesive.injekt.injectLazy import java.util.Locale -@Nsfw class Mihentai : WPMangaStream("Mihentai", "https://mihentai.com", "en") { override fun popularMangaRequest(page: Int): Request { return GET("$baseUrl/manga/page/$page/?order=popular", headers) diff --git a/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt b/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt index 2d90916eb..a4cd8168d 100644 --- a/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt +++ b/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.id.sektedoujin -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient @@ -8,7 +7,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class SekteDoujin : WPMangaStream("Sekte Doujin", "https://sektedoujin.xyz", "id", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("id"))) { private val rateLimitInterceptor = RateLimitInterceptor(4) diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt index 71c0ce44f..7cb4e2504 100644 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -72,7 +72,7 @@ interface ThemeSourceGenerator { extClass = '.${source.className}' extFactory = '$themePkg' extVersionCode = ${baseVersionCode + source.overrideVersionCode + multisrcLibraryVersion} - ${if (source.isNsfw) "containsNsfw = true\n" else ""} + ${if (source.isNsfw) "isNsfw = true\n" else ""} } $defaultAdditionalGradleText $additionalGradleOverrideText @@ -200,9 +200,7 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass ${if (source is ThemeSourceData.MultiLang) "import eu.kanade.tachiyomi.source.SourceFactory" else ""} - ${if (source.isNsfw) "import eu.kanade.tachiyomi.annotations.Nsfw" else ""} - ${if (source.isNsfw) "\n@Nsfw" else ""} ${factoryClassText()} """.trimIndent() ) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5aa2e5d6c..976c700ff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,3 @@ -include(":annotations") include(":core") include(":lib-ratelimit") diff --git a/src/all/batoto/build.gradle b/src/all/batoto/build.gradle index be6ae9d56..c85897759 100644 --- a/src/all/batoto/build.gradle +++ b/src/all/batoto/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.batoto' extClass = '.BatoToFactory' extVersionCode = 15 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt index 620f7789c..936f90569 100644 --- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt +++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoToFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.batoto -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class BatoToFactory : SourceFactory { override fun createSources(): List = languages.map { BatoTo(it.lang, it.siteLang) } } diff --git a/src/all/comickfun/build.gradle b/src/all/comickfun/build.gradle index fa4c1aeff..86c04769e 100644 --- a/src/all/comickfun/build.gradle +++ b/src/all/comickfun/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.comickfun' extClass = '.ComickFunFactory' extVersionCode = 6 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFactory.kt b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFactory.kt index ef6de20b6..2f3fdace2 100644 --- a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFactory.kt +++ b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/ComickFunFactory.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.comickfun -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory @@ -29,7 +28,6 @@ val toISO639 = mapOf( ).withDefault { it } // country code matches language code -@Nsfw class ComickFunFactory : SourceFactory { override fun createSources(): List = listOf( "all", diff --git a/src/all/ehentai/build.gradle b/src/all/ehentai/build.gradle index b836439a0..8200ff0d6 100644 --- a/src/all/ehentai/build.gradle +++ b/src/all/ehentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'all.ehentai' extClass = '.EHFactory' extVersionCode = 14 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHFactory.kt b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHFactory.kt index 742b7d364..2ab1deca7 100644 --- a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHFactory.kt +++ b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.ehentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class EHFactory : SourceFactory { override fun createSources(): List = listOf( EHentaiJa(), diff --git a/src/all/hentaihand/build.gradle b/src/all/hentaihand/build.gradle index 632e897f4..68a1c123e 100644 --- a/src/all/hentaihand/build.gradle +++ b/src/all/hentaihand/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.hentaihand' extClass = '.HentaiHandFactory' extVersionCode = 4 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt index 9a935ff65..14142ed31 100644 --- a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt +++ b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHand.kt @@ -4,7 +4,6 @@ import android.app.Application import android.content.SharedPreferences import android.text.InputType import android.widget.Toast -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -39,7 +38,6 @@ import uy.kohesive.injekt.injectLazy import java.text.SimpleDateFormat import java.util.Locale -@Nsfw abstract class HentaiHand( override val lang: String, private val hhLangId: Int? = null, diff --git a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt index b4caff519..b0303388f 100644 --- a/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt +++ b/src/all/hentaihand/src/eu/kanade/tachiyomi/extension/all/hentaihand/HentaiHandFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.hentaihand -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class HentaiHandFactory : SourceFactory { override fun createSources(): List = listOf( diff --git a/src/all/hitomi/build.gradle b/src/all/hitomi/build.gradle index 8d896687a..0970f886b 100644 --- a/src/all/hitomi/build.gradle +++ b/src/all/hitomi/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.hitomi' extClass = '.HitomiFactory' extVersionCode = 10 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiFactory.kt b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiFactory.kt index bdb47cd42..43b912250 100644 --- a/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiFactory.kt +++ b/src/all/hitomi/src/eu/kanade/tachiyomi/extension/all/hitomi/HitomiFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.hitomi -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class HitomiFactory : SourceFactory { override fun createSources(): List = languageList .map { Hitomi(it.first, it.second) } diff --git a/src/all/imhentai/build.gradle b/src/all/imhentai/build.gradle index 6ed96593d..4e627f649 100644 --- a/src/all/imhentai/build.gradle +++ b/src/all/imhentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'all.imhentai' extClass = '.IMHentaiFactory' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentaiFactory.kt b/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentaiFactory.kt index 38541894d..5d26ed661 100644 --- a/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentaiFactory.kt +++ b/src/all/imhentai/src/eu/kanade/tachiyomi/extension/all/imhentai/IMHentaiFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.imhentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class IMHentaiFactory : SourceFactory { override fun createSources(): List = listOf( diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index f0f507062..411dbcbfc 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.mangadex' extClass = '.MangaDexFactory' extVersionCode = 139 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt index 448b87a4a..7fd242665 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.mangadex -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class MangaDexFactory : SourceFactory { override fun createSources(): List = listOf( MangaDexEnglish(), diff --git a/src/all/mangapark/build.gradle b/src/all/mangapark/build.gradle index 3c63e8b7d..51fdad611 100644 --- a/src/all/mangapark/build.gradle +++ b/src/all/mangapark/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.mangapark' extClass = '.MangaParkFactory' extVersionCode = 12 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/mangapark/src/eu/kanade/tachiyomi/extension/all/mangapark/MangaParkFactory.kt b/src/all/mangapark/src/eu/kanade/tachiyomi/extension/all/mangapark/MangaParkFactory.kt index 2a82627fd..8466f435f 100644 --- a/src/all/mangapark/src/eu/kanade/tachiyomi/extension/all/mangapark/MangaParkFactory.kt +++ b/src/all/mangapark/src/eu/kanade/tachiyomi/extension/all/mangapark/MangaParkFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.mangapark -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class MangaParkFactory : SourceFactory { override fun createSources(): List = languages.map { MangaPark(it.lang, it.siteLang) } } diff --git a/src/all/myreadingmanga/build.gradle b/src/all/myreadingmanga/build.gradle index 3c18ec3ae..b648df302 100644 --- a/src/all/myreadingmanga/build.gradle +++ b/src/all/myreadingmanga/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'all.myreadingmanga' extClass = '.MyReadingMangaFactory' extVersionCode = 43 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt index 6bbcdb1b1..658c90c5c 100644 --- a/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt +++ b/src/all/myreadingmanga/src/eu/kanade/tachiyomi/extension/all/myreadingmanga/MyReadingMangaFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.myreadingmanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class MyReadingMangaFactory : SourceFactory { override fun createSources(): List = languageList.map { MyReadingManga(it.tachiLang, it.siteLang, it.latestLang) } } diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle index 19501c591..eb71c38f5 100644 --- a/src/all/nhentai/build.gradle +++ b/src/all/nhentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'all.nhentai' extClass = '.NHFactory' extVersionCode = 29 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHFactory.kt b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHFactory.kt index 722c4f673..50d3fb33b 100644 --- a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHFactory.kt +++ b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.nhentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class NHFactory : SourceFactory { override fun createSources(): List = listOf( NHentai("en", "english"), diff --git a/src/all/nhentaicom/build.gradle b/src/all/nhentaicom/build.gradle index 94447aa03..e9b9b868e 100644 --- a/src/all/nhentaicom/build.gradle +++ b/src/all/nhentaicom/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'all.nhentaicom' extClass = '.NHentaiComFactory' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt index 39a0ca5a4..23045753a 100644 --- a/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt +++ b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiCom.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.nhentaicom -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.Filter @@ -21,7 +20,6 @@ import okhttp3.Response import rx.Observable import uy.kohesive.injekt.injectLazy -@Nsfw class NHentaiCom(override val lang: String) : HttpSource() { override val name = when (lang) { diff --git a/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt index b57417df3..7966a4528 100644 --- a/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt +++ b/src/all/nhentaicom/src/eu/kanade/tachiyomi/extension/all/nhentaicom/NHentaiComFactory.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.extension.all.nhentaicom -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -@Nsfw class NHentaiComFactory : SourceFactory { override fun createSources(): List = languages.map { NHentaiCom(it) } } diff --git a/src/all/ninehentai/build.gradle b/src/all/ninehentai/build.gradle index 66a0e7125..580b1c415 100644 --- a/src/all/ninehentai/build.gradle +++ b/src/all/ninehentai/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.ninehentai' extClass = '.NineHentai' extVersionCode = 13 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt b/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt index df443be7d..3938d05dc 100644 --- a/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt +++ b/src/all/ninehentai/src/eu/kanade/tachiyomi/extension/all/ninehentai/NineHentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.all.ninehentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -30,7 +29,6 @@ import rx.schedulers.Schedulers import uy.kohesive.injekt.injectLazy import java.util.Calendar -@Nsfw class NineHentai : HttpSource() { override val baseUrl = "https://9hentai.to" diff --git a/src/all/simplyhentai/build.gradle b/src/all/simplyhentai/build.gradle index 403128f46..77fd6c8b0 100644 --- a/src/all/simplyhentai/build.gradle +++ b/src/all/simplyhentai/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.simplyhentai' extClass = '.SimplyHentaiFactory' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentaiFactory.kt b/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentaiFactory.kt index 7a454fcf2..376107bc9 100644 --- a/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentaiFactory.kt +++ b/src/all/simplyhentai/src/eu/kanade/tachiyomi/extension/all/simplyhentai/SimplyHentaiFactory.kt @@ -1,10 +1,9 @@ package eu.kanade.tachiyomi.extension.all.simplyhentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.SourceFactory import kotlinx.serialization.ExperimentalSerializationApi -@ExperimentalSerializationApi @Nsfw +@ExperimentalSerializationApi class SimplyHentaiFactory : SourceFactory { override fun createSources() = listOf( SimplyHentai("en"), diff --git a/src/all/tachidesk/build.gradle b/src/all/tachidesk/build.gradle index 157c725bc..c0ab9cac2 100644 --- a/src/all/tachidesk/build.gradle +++ b/src/all/tachidesk/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'all.tachidesk' extClass = '.Tachidesk' extVersionCode = 3 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/ar/gmanga/build.gradle b/src/ar/gmanga/build.gradle index 074fb5c7c..ad435ab75 100644 --- a/src/ar/gmanga/build.gradle +++ b/src/ar/gmanga/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ar.gmanga' extClass = '.Gmanga' extVersionCode = 7 - containsNsfw = false + isNsfw = false } dependencies { diff --git a/src/ca/fansubscat/build.gradle b/src/ca/fansubscat/build.gradle index a813adecb..b6c338fae 100644 --- a/src/ca/fansubscat/build.gradle +++ b/src/ca/fansubscat/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ca.fansubscat' extClass = '.FansubsCat' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/bilibilicomics/build.gradle b/src/en/bilibilicomics/build.gradle index 2323ad815..167a1048d 100644 --- a/src/en/bilibilicomics/build.gradle +++ b/src/en/bilibilicomics/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.bilibilicomics' extClass = '.BilibiliComics' extVersionCode = 7 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliComics.kt b/src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliComics.kt index 3c046cf44..08b37d0eb 100644 --- a/src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliComics.kt +++ b/src/en/bilibilicomics/src/eu/kanade/tachiyomi/extension/en/bilibilicomics/BilibiliComics.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.bilibilicomics -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -32,7 +31,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class BilibiliComics : HttpSource() { override val name = "BILIBILI COMICS" diff --git a/src/en/brewingscans/build.gradle b/src/en/brewingscans/build.gradle index dab17c13a..70a3832a5 100644 --- a/src/en/brewingscans/build.gradle +++ b/src/en/brewingscans/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.brewingscans' extClass = '.BrewingScans' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/brewingscans/src/eu/kanade/tachiyomi/extension/en/brewingscans/BrewingScans.kt b/src/en/brewingscans/src/eu/kanade/tachiyomi/extension/en/brewingscans/BrewingScans.kt index 9d95996bf..b9bf60db2 100644 --- a/src/en/brewingscans/src/eu/kanade/tachiyomi/extension/en/brewingscans/BrewingScans.kt +++ b/src/en/brewingscans/src/eu/kanade/tachiyomi/extension/en/brewingscans/BrewingScans.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.brewingscans -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList @@ -14,7 +13,7 @@ import kotlinx.serialization.json.Json import okhttp3.Response import uy.kohesive.injekt.injectLazy -@Nsfw class BrewingScans : HttpSource() { +class BrewingScans : HttpSource() { override val lang = "en" override val name = "Brewing Scans" diff --git a/src/en/doujins/build.gradle b/src/en/doujins/build.gradle index 463848bcb..61fc50ddb 100644 --- a/src/en/doujins/build.gradle +++ b/src/en/doujins/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.doujins' extClass = '.Doujins' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt index 08f1b59ee..eac3ff6af 100644 --- a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt +++ b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt @@ -6,7 +6,6 @@ import com.github.salomonbrys.kotson.fromJson import com.github.salomonbrys.kotson.get import com.google.gson.Gson import com.google.gson.JsonObject -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -28,7 +27,6 @@ import java.util.Date import java.util.Locale import java.util.TimeZone -@Nsfw class Doujins : HttpSource() { override val baseUrl: String = "https://doujins.com" diff --git a/src/en/eggporncomics/build.gradle b/src/en/eggporncomics/build.gradle index 57e2c0a96..76b242b18 100644 --- a/src/en/eggporncomics/build.gradle +++ b/src/en/eggporncomics/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.eggporncomics' extClass = '.Eggporncomics' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt b/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt index c76298ff3..3e094b372 100644 --- a/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt +++ b/src/en/eggporncomics/src/eu/kanade/tachiyomi/extension/en/eggporncomics/Eggporncomics.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.eggporncomics -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservable import eu.kanade.tachiyomi.source.model.Filter @@ -20,7 +19,6 @@ import org.jsoup.nodes.Element import rx.Observable import java.util.Calendar -@Nsfw class Eggporncomics : ParsedHttpSource() { override val name = "Eggporncomics" diff --git a/src/en/hbrowse/build.gradle b/src/en/hbrowse/build.gradle index ad9b9330c..8f26b2c5b 100644 --- a/src/en/hbrowse/build.gradle +++ b/src/en/hbrowse/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.hbrowse' extClass = '.HBrowse' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt b/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt index e2accbaf4..e062569cb 100644 --- a/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt +++ b/src/en/hbrowse/src/eu/kanade/tachiyomi/extension/en/hbrowse/HBrowse.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hbrowse -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.model.Filter @@ -20,7 +19,6 @@ import org.jsoup.nodes.Element import uy.kohesive.injekt.injectLazy import java.io.IOException -@Nsfw class HBrowse : ParsedHttpSource() { override val name = "HBrowse" diff --git a/src/en/hentai2read/build.gradle b/src/en/hentai2read/build.gradle index 337bf4772..5c7b91007 100644 --- a/src/en/hentai2read/build.gradle +++ b/src/en/hentai2read/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.hentai2read' extClass = '.Hentai2Read' extVersionCode = 12 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt index abcb130b5..b3f95acd2 100644 --- a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt +++ b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hentai2read -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -22,7 +21,6 @@ import rx.Observable import java.util.Calendar import java.util.regex.Pattern -@Nsfw class Hentai2Read : ParsedHttpSource() { override val name = "Hentai2Read" diff --git a/src/en/hentaifox/build.gradle b/src/en/hentaifox/build.gradle index 0208af651..387404b2f 100644 --- a/src/en/hentaifox/build.gradle +++ b/src/en/hentaifox/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.hentaifox' extClass = '.HentaiFox' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt b/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt index 8ee28bfd4..5e0bc2470 100644 --- a/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt +++ b/src/en/hentaifox/src/eu/kanade/tachiyomi/extension/en/hentaifox/HentaiFox.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hentaifox -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -17,7 +16,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class HentaiFox : ParsedHttpSource() { override val name = "HentaiFox" diff --git a/src/en/hwtmanga/build.gradle b/src/en/hwtmanga/build.gradle index 7ba873c1c..43a939339 100644 --- a/src/en/hwtmanga/build.gradle +++ b/src/en/hwtmanga/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.hwtmanga' extClass = '.HWTManga' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/hwtmanga/src/eu/kanade/tachiyomi/extension/en/hwtmanga/HWTManga.kt b/src/en/hwtmanga/src/eu/kanade/tachiyomi/extension/en/hwtmanga/HWTManga.kt index fd0a862ee..00ca63b6f 100644 --- a/src/en/hwtmanga/src/eu/kanade/tachiyomi/extension/en/hwtmanga/HWTManga.kt +++ b/src/en/hwtmanga/src/eu/kanade/tachiyomi/extension/en/hwtmanga/HWTManga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.hwtmanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList @@ -22,7 +21,7 @@ import uy.kohesive.injekt.injectLazy import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HWTManga : HttpSource() { +class HWTManga : HttpSource() { override val name = "Hardworking Translations" override val baseUrl = "https://www.hwtmanga.com/hwt/" diff --git a/src/en/inkr/build.gradle b/src/en/inkr/build.gradle index 44e9e5044..1787b4f27 100644 --- a/src/en/inkr/build.gradle +++ b/src/en/inkr/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.inkr' extClass = '.Inkr' extVersionCode = 3 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/en/inkr/src/eu/kanade/tachiyomi/extension/en/inkr/Inkr.kt b/src/en/inkr/src/eu/kanade/tachiyomi/extension/en/inkr/Inkr.kt index 32a5d4b8d..fcb4d5993 100644 --- a/src/en/inkr/src/eu/kanade/tachiyomi/extension/en/inkr/Inkr.kt +++ b/src/en/inkr/src/eu/kanade/tachiyomi/extension/en/inkr/Inkr.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.inkr -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST @@ -37,7 +36,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class Inkr : HttpSource() { override val name = "INKR" diff --git a/src/en/latisbooks/build.gradle b/src/en/latisbooks/build.gradle index febf7f379..a87ea74e4 100644 --- a/src/en/latisbooks/build.gradle +++ b/src/en/latisbooks/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.latisbooks' extClass = '.Latisbooks' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/latisbooks/src/eu/kanade/tachiyomi/extension/en/latisbooks/Latisbooks.kt b/src/en/latisbooks/src/eu/kanade/tachiyomi/extension/en/latisbooks/Latisbooks.kt index b8c34c9f4..be4ac3c55 100644 --- a/src/en/latisbooks/src/eu/kanade/tachiyomi/extension/en/latisbooks/Latisbooks.kt +++ b/src/en/latisbooks/src/eu/kanade/tachiyomi/extension/en/latisbooks/Latisbooks.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.latisbooks -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList @@ -16,7 +15,6 @@ import okhttp3.Response import rx.Observable import java.util.Calendar -@Nsfw class Latisbooks : HttpSource() { override val name = "Latis Books" diff --git a/src/en/lemonfont/build.gradle b/src/en/lemonfont/build.gradle index edc0cceff..221b23ecf 100644 --- a/src/en/lemonfont/build.gradle +++ b/src/en/lemonfont/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.lemonfont' extClass = '.LemonFont' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/lemonfont/src/eu/kanade/tachiyomi/extension/en/lemonfont/LemonFont.kt b/src/en/lemonfont/src/eu/kanade/tachiyomi/extension/en/lemonfont/LemonFont.kt index 750f7a02d..901b2acfe 100644 --- a/src/en/lemonfont/src/eu/kanade/tachiyomi/extension/en/lemonfont/LemonFont.kt +++ b/src/en/lemonfont/src/eu/kanade/tachiyomi/extension/en/lemonfont/LemonFont.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.lemonfont -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage @@ -14,7 +13,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class LemonFont : ParsedHttpSource() { override val name = "LemonFont" diff --git a/src/en/manga1s/build.gradle b/src/en/manga1s/build.gradle index ed2c83d50..f3a481e92 100644 --- a/src/en/manga1s/build.gradle +++ b/src/en/manga1s/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.manga1s' extClass = '.manga1s' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/mangamiso/build.gradle b/src/en/mangamiso/build.gradle index 67b14459d..9ce8d30d7 100644 --- a/src/en/mangamiso/build.gradle +++ b/src/en/mangamiso/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.mangamiso' extClass = '.MangaMiso' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/mangamiso/src/eu/kanade/tachiyomi/extension/en/mangamiso/MangaMiso.kt b/src/en/mangamiso/src/eu/kanade/tachiyomi/extension/en/mangamiso/MangaMiso.kt index 4c5f9aae6..785a6fcb7 100644 --- a/src/en/mangamiso/src/eu/kanade/tachiyomi/extension/en/mangamiso/MangaMiso.kt +++ b/src/en/mangamiso/src/eu/kanade/tachiyomi/extension/en/mangamiso/MangaMiso.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mangamiso -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.Filter @@ -23,7 +22,6 @@ import java.lang.Exception import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class MangaMiso : HttpSource() { companion object { diff --git a/src/en/mangamutiny/build.gradle b/src/en/mangamutiny/build.gradle index 6dabbc584..a1c55d716 100644 --- a/src/en/mangamutiny/build.gradle +++ b/src/en/mangamutiny/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = "en.mangamutiny" extClass = '.MangaMutiny' extVersionCode = 8 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/mangarawclub/build.gradle b/src/en/mangarawclub/build.gradle index 8ac210b92..766f6a710 100644 --- a/src/en/mangarawclub/build.gradle +++ b/src/en/mangarawclub/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.mangarawclub' extClass = '.MangaRawClub' extVersionCode = 4 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/mangarawclub/src/eu/kanade/tachiyomi/extension/en/mangarawclub/MangaRawClub.kt b/src/en/mangarawclub/src/eu/kanade/tachiyomi/extension/en/mangarawclub/MangaRawClub.kt index b9317ee50..5c07233c7 100644 --- a/src/en/mangarawclub/src/eu/kanade/tachiyomi/extension/en/mangarawclub/MangaRawClub.kt +++ b/src/en/mangarawclub/src/eu/kanade/tachiyomi/extension/en/mangarawclub/MangaRawClub.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.mangarawclub -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservableSuccess @@ -25,7 +24,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class MangaRawClub : ParsedHttpSource() { override val name = "manga-raw.club" diff --git a/src/en/manhuamanga/build.gradle b/src/en/manhuamanga/build.gradle index 3ea58140f..69f678745 100644 --- a/src/en/manhuamanga/build.gradle +++ b/src/en/manhuamanga/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.manhuamanga' extClass = '.ManhuaManga' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt b/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt index 5640ed360..84f915762 100644 --- a/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt +++ b/src/en/manhuamanga/src/eu/kanade/tachiyomi/extension/en/manhuamanga/ManhuaManga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.manhuamanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.model.Filter @@ -17,7 +16,6 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@Nsfw class ManhuaManga : ParsedHttpSource() { override val name = "ManhuaManga.net" override val baseUrl = "https://manhuamanga.net" diff --git a/src/en/manhwamanga/build.gradle b/src/en/manhwamanga/build.gradle index 5e3c23a63..7f23ca5db 100644 --- a/src/en/manhwamanga/build.gradle +++ b/src/en/manhwamanga/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.manhwamanga' extClass = '.ManhwaManga' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt b/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt index b7e536a65..1b68aff43 100644 --- a/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt +++ b/src/en/manhwamanga/src/eu/kanade/tachiyomi/extension/en/manhwamanga/ManhwaManga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.manhwamanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.model.Filter @@ -17,7 +16,6 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@Nsfw class ManhwaManga : ParsedHttpSource() { override val name = "ManhwaManga.net" override val baseUrl = "https://manhwamanga.net" diff --git a/src/en/multporn/build.gradle b/src/en/multporn/build.gradle index d1a4f1382..152b9c401 100644 --- a/src/en/multporn/build.gradle +++ b/src/en/multporn/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.multporn' extClass = '.Multporn' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt b/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt index ca0562059..1c3f328c7 100644 --- a/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt +++ b/src/en/multporn/src/eu/kanade/tachiyomi/extension/en/multporn/Multporn.kt @@ -4,7 +4,6 @@ import com.github.salomonbrys.kotson.fromJson import com.github.salomonbrys.kotson.get import com.google.gson.Gson import com.google.gson.JsonArray -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.network.asObservable @@ -30,7 +29,6 @@ import rx.Observable import rx.schedulers.Schedulers import java.util.Locale -@Nsfw class Multporn : ParsedHttpSource() { override val name = "Multporn" diff --git a/src/en/myhentaicomics/build.gradle b/src/en/myhentaicomics/build.gradle index 36a91bde9..1ffe43ecd 100644 --- a/src/en/myhentaicomics/build.gradle +++ b/src/en/myhentaicomics/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.myhentaicomics' extClass = '.MyHentaiComics' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/myhentaicomics/src/eu/kanade/tachiyomi/extension/en/myhentaicomics/MyHentaiComics.kt b/src/en/myhentaicomics/src/eu/kanade/tachiyomi/extension/en/myhentaicomics/MyHentaiComics.kt index 81209e6d4..17976aec5 100644 --- a/src/en/myhentaicomics/src/eu/kanade/tachiyomi/extension/en/myhentaicomics/MyHentaiComics.kt +++ b/src/en/myhentaicomics/src/eu/kanade/tachiyomi/extension/en/myhentaicomics/MyHentaiComics.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.myhentaicomics -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -15,7 +14,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class MyHentaiComics : ParsedHttpSource() { override val name = "MyHentaiComics" diff --git a/src/en/myhentaigallery/build.gradle b/src/en/myhentaigallery/build.gradle index 8b021d566..93a383d3d 100644 --- a/src/en/myhentaigallery/build.gradle +++ b/src/en/myhentaigallery/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.myhentaigallery' extClass = '.MyHentaiGallery' extVersionCode = 2 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt b/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt index c1e0bc88d..ccb637378 100644 --- a/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt +++ b/src/en/myhentaigallery/src/eu/kanade/tachiyomi/extension/en/myhentaigallery/MyHentaiGallery.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.myhentaigallery -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.Filter @@ -18,7 +17,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class MyHentaiGallery : ParsedHttpSource() { override val name = "MyHentaiGallery" diff --git a/src/en/oglaf/build.gradle b/src/en/oglaf/build.gradle index 57d24fa89..1c53bf9f8 100644 --- a/src/en/oglaf/build.gradle +++ b/src/en/oglaf/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.oglaf' extClass = '.Oglaf' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/oglaf/src/eu/kanade/tachiyomi/extension/en/oglaf/Oglaf.kt b/src/en/oglaf/src/eu/kanade/tachiyomi/extension/en/oglaf/Oglaf.kt index 25eaa9d8f..025497d7b 100644 --- a/src/en/oglaf/src/eu/kanade/tachiyomi/extension/en/oglaf/Oglaf.kt +++ b/src/en/oglaf/src/eu/kanade/tachiyomi/extension/en/oglaf/Oglaf.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.oglaf -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage @@ -15,7 +14,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class Oglaf : ParsedHttpSource() { override val name = "Oglaf" diff --git a/src/en/oots/build.gradle b/src/en/oots/build.gradle index 8da0e81c6..90af54d08 100644 --- a/src/en/oots/build.gradle +++ b/src/en/oots/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.oots' extClass = '.oots' extVersionCode = 1 - containsNsfw = false + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/perveden/build.gradle b/src/en/perveden/build.gradle index 2d526a783..dc128a705 100644 --- a/src/en/perveden/build.gradle +++ b/src/en/perveden/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.perveden' extClass = '.Perveden' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt b/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt index 79910a237..fbc8612bf 100644 --- a/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt +++ b/src/en/perveden/src/eu/kanade/tachiyomi/extension/en/perveden/Perveden.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.perveden -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -17,7 +16,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale -@Nsfw class Perveden : ParsedHttpSource() { override val name = "PervEden" diff --git a/src/en/pururin/build.gradle b/src/en/pururin/build.gradle index a5a4cafb8..fd5668258 100644 --- a/src/en/pururin/build.gradle +++ b/src/en/pururin/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.pururin' extClass = '.Pururin' extVersionCode = 4 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt b/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt index 5f43ed612..70897ea3f 100644 --- a/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt +++ b/src/en/pururin/src/eu/kanade/tachiyomi/extension/en/pururin/Pururin.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.pururin -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -16,7 +15,6 @@ import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@Nsfw class Pururin : ParsedHttpSource() { override val name = "Pururin" diff --git a/src/en/rainofsnow/build.gradle b/src/en/rainofsnow/build.gradle index a46f9232d..0d7a094c5 100644 --- a/src/en/rainofsnow/build.gradle +++ b/src/en/rainofsnow/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.rainofsnow' extClass = '.RainOfSnow' extVersionCode = 7 - containsNsfw = false + isNsfw = false } dependencies { diff --git a/src/en/readmanhwa/build.gradle b/src/en/readmanhwa/build.gradle index 8b93d7109..8d6ce23d1 100644 --- a/src/en/readmanhwa/build.gradle +++ b/src/en/readmanhwa/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'en.readmanhwa' extClass = '.ReadManhwa' extVersionCode = 8 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt b/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt index 503ece982..0f6125c4b 100644 --- a/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt +++ b/src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt @@ -10,7 +10,6 @@ import com.github.salomonbrys.kotson.string import com.google.gson.Gson import com.google.gson.JsonArray import com.google.gson.JsonObject -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.ConfigurableSource @@ -33,7 +32,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale -@Nsfw class ReadManhwa : ConfigurableSource, HttpSource() { override val name = "ReadManhwa" diff --git a/src/en/toptoonplus/build.gradle b/src/en/toptoonplus/build.gradle index eceb342d2..135060cd9 100644 --- a/src/en/toptoonplus/build.gradle +++ b/src/en/toptoonplus/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.toptoonplus' extClass = '.TopToonPlus' extVersionCode = 1 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/en/toptoonplus/src/eu/kanade/tachiyomi/extension/en/toptoonplus/TopToonPlus.kt b/src/en/toptoonplus/src/eu/kanade/tachiyomi/extension/en/toptoonplus/TopToonPlus.kt index 30b3fab3e..5b0147ec4 100644 --- a/src/en/toptoonplus/src/eu/kanade/tachiyomi/extension/en/toptoonplus/TopToonPlus.kt +++ b/src/en/toptoonplus/src/eu/kanade/tachiyomi/extension/en/toptoonplus/TopToonPlus.kt @@ -7,7 +7,6 @@ import android.util.Base64 import androidx.preference.CheckBoxPreference import androidx.preference.EditTextPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST @@ -44,7 +43,6 @@ import java.util.Locale import java.util.UUID import java.util.concurrent.TimeUnit -@Nsfw class TopToonPlus : HttpSource(), ConfigurableSource { override val name = "TOPTOON+" diff --git a/src/en/tsumino/build.gradle b/src/en/tsumino/build.gradle index ab586a381..052136188 100644 --- a/src/en/tsumino/build.gradle +++ b/src/en/tsumino/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'en.tsumino' extClass = '.Tsumino' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt index 060d95d82..3b3c9f348 100644 --- a/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt +++ b/src/en/tsumino/src/eu/kanade/tachiyomi/extension/en/tsumino/Tsumino.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.en.tsumino -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.extension.en.tsumino.TsuminoUtils.Companion.getArtists import eu.kanade.tachiyomi.extension.en.tsumino.TsuminoUtils.Companion.getChapter import eu.kanade.tachiyomi.extension.en.tsumino.TsuminoUtils.Companion.getCollection @@ -33,7 +32,6 @@ import okhttp3.ResponseBody.Companion.toResponseBody import rx.Observable import uy.kohesive.injekt.injectLazy -@Nsfw class Tsumino : HttpSource() { override val name = "Tsumino" diff --git a/src/es/doujinyang/build.gradle b/src/es/doujinyang/build.gradle index 674a6cb99..339781b95 100644 --- a/src/es/doujinyang/build.gradle +++ b/src/es/doujinyang/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'es.doujinyang' extClass = '.DoujinYang' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt b/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt index b772d2088..d11bce40c 100644 --- a/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt +++ b/src/es/doujinyang/src/eu/kanade/tachiyomi/extension/es/doujinyang/DoujinYang.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.extension.es.doujinyang import android.net.Uri -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.model.Filter @@ -20,7 +19,6 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class DoujinYang : ParsedHttpSource() { override val name = "Doujin-Yang" diff --git a/src/es/ikuhentai/build.gradle b/src/es/ikuhentai/build.gradle index 0200977d8..734102a29 100755 --- a/src/es/ikuhentai/build.gradle +++ b/src/es/ikuhentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'es.ikuhentai' extClass = '.Ikuhentai' extVersionCode = 1 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt b/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt index b4e135651..5c86921ea 100755 --- a/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt +++ b/src/es/ikuhentai/src/eu/kanade/tachiyomi/extension/es/ikuhentai/Ikuhentai.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.es.ikuhentai -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -15,7 +14,6 @@ import okhttp3.Request import org.jsoup.nodes.Document import org.jsoup.nodes.Element -@Nsfw class Ikuhentai : ParsedHttpSource() { override val name = "Ikuhentai" override val baseUrl = "https://ikuhentai.net/" diff --git a/src/es/leermangasxyz/build.gradle b/src/es/leermangasxyz/build.gradle index a55229356..291003f22 100644 --- a/src/es/leermangasxyz/build.gradle +++ b/src/es/leermangasxyz/build.gradle @@ -7,7 +7,7 @@ ext { extClass = '.LeerMangasXYZ' extVersionCode = 1 libVersion = '1.2' - containsNsfw = false + isNsfw = false } apply from: "$rootDir/common.gradle" \ No newline at end of file diff --git a/src/es/tmohentai/build.gradle b/src/es/tmohentai/build.gradle index 6dd4d1ca5..c91a5a70f 100755 --- a/src/es/tmohentai/build.gradle +++ b/src/es/tmohentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'es.tmohentai' extClass = '.TMOHentai' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt index 1b31ea89e..398728855 100755 --- a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt +++ b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension.es.tmohentai import android.app.Application import android.content.SharedPreferences -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.ConfigurableSource @@ -21,7 +20,6 @@ import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -@Nsfw class TMOHentai : ConfigurableSource, ParsedHttpSource() { override val name = "TMOHentai" diff --git a/src/es/vcpvmp/build.gradle b/src/es/vcpvmp/build.gradle index 4266454b9..6764d93cf 100644 --- a/src/es/vcpvmp/build.gradle +++ b/src/es/vcpvmp/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = "es.vcpvmp" extClass = '.VCPVMPFactory' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMPFactory.kt b/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMPFactory.kt index 25660dc09..ee96d58f3 100644 --- a/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMPFactory.kt +++ b/src/es/vcpvmp/src/eu/kanade/tachiyomi/extension/es/vcpvmp/VCPVMPFactory.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.es.vcpvmp -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.SManga import org.jsoup.nodes.Element -@Nsfw class VCPVMPFactory : SourceFactory { override fun createSources(): List = listOf( VCP(), diff --git a/src/fr/japanread/build.gradle b/src/fr/japanread/build.gradle index 21c553c90..b98c13df8 100644 --- a/src/fr/japanread/build.gradle +++ b/src/fr/japanread/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'fr.japanread' extClass = '.Japanread' extVersionCode = 8 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/fr/scanmanga/build.gradle b/src/fr/scanmanga/build.gradle index cbe8e9d79..06bfe0513 100644 --- a/src/fr/scanmanga/build.gradle +++ b/src/fr/scanmanga/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'fr.scanmanga' extClass = '.ScanManga' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/it/digitalteam/build.gradle b/src/it/digitalteam/build.gradle index ff54a4f67..130800d7c 100644 --- a/src/it/digitalteam/build.gradle +++ b/src/it/digitalteam/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'it.digitalteam' extClass = '.DigitalTeam' extVersionCode = 2 - containsNsfw = false + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/it/hentaifantasy/build.gradle b/src/it/hentaifantasy/build.gradle index 4c2ae4138..d1862a56f 100644 --- a/src/it/hentaifantasy/build.gradle +++ b/src/it/hentaifantasy/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'it.hentaifantasy' extClass = '.HentaiFantasy' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt b/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt index 52474407d..cbc32bb92 100644 --- a/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt +++ b/src/it/hentaifantasy/src/eu/kanade/tachiyomi/extension/it/hentaifantasy/HentaiFantasy.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.it.hentaifantasy -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.model.Filter @@ -20,7 +19,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.regex.Pattern -@Nsfw class HentaiFantasy : ParsedHttpSource() { override val name = "HentaiFantasy" diff --git a/src/it/mangaworld/build.gradle b/src/it/mangaworld/build.gradle index d20bee229..ad2ef9b7c 100644 --- a/src/it/mangaworld/build.gradle +++ b/src/it/mangaworld/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'it.mangaworld' extClass = '.Mangaworld' extVersionCode = 5 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt index 5fe1c8a29..41585c32b 100644 --- a/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt +++ b/src/it/mangaworld/src/eu/kanade/tachiyomi/extension/it/mangaworld/Mangaworld.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.it.mangaworld -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -21,7 +20,6 @@ import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Mangaworld : ParsedHttpSource() { override val name = "Mangaworld" diff --git a/src/it/perveden/build.gradle b/src/it/perveden/build.gradle index 99ab44355..102e8b0b3 100644 --- a/src/it/perveden/build.gradle +++ b/src/it/perveden/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'it.perveden' extClass = '.Perveden' extVersionCode = 3 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt b/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt index 6ae340059..cc2abeb71 100644 --- a/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt +++ b/src/it/perveden/src/eu/kanade/tachiyomi/extension/it/perveden/Perveden.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.it.perveden -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -17,7 +16,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale -@Nsfw class Perveden : ParsedHttpSource() { override val name = "PervEden" diff --git a/src/pt/brmangas/build.gradle b/src/pt/brmangas/build.gradle index baa3954d6..f4f60f51e 100644 --- a/src/pt/brmangas/build.gradle +++ b/src/pt/brmangas/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'pt.brmangas' extClass = '.BrMangas' extVersionCode = 3 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/brmangas/src/eu/kanade/tachiyomi/extension/pt/brmangas/BrMangas.kt b/src/pt/brmangas/src/eu/kanade/tachiyomi/extension/pt/brmangas/BrMangas.kt index 55b5ca8e0..c52dc9ab2 100644 --- a/src/pt/brmangas/src/eu/kanade/tachiyomi/extension/pt/brmangas/BrMangas.kt +++ b/src/pt/brmangas/src/eu/kanade/tachiyomi/extension/pt/brmangas/BrMangas.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.brmangas -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList @@ -17,7 +16,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.util.concurrent.TimeUnit -@Nsfw class BrMangas : ParsedHttpSource() { override val name = "BR Mangás" diff --git a/src/pt/hipercool/build.gradle b/src/pt/hipercool/build.gradle index 9dc3a7dbb..cd33def3a 100644 --- a/src/pt/hipercool/build.gradle +++ b/src/pt/hipercool/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'pt.hipercool' extClass = '.Hipercool' extVersionCode = 8 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt b/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt index 87c78728f..aaa225b8e 100644 --- a/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt +++ b/src/pt/hipercool/src/eu/kanade/tachiyomi/extension/pt/hipercool/Hipercool.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.hipercool -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST @@ -30,7 +29,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class Hipercool : HttpSource() { // Hardcode the id because the language wasn't specific. diff --git a/src/pt/mangavibe/build.gradle b/src/pt/mangavibe/build.gradle index 9e1c6e6a8..f3583a47b 100644 --- a/src/pt/mangavibe/build.gradle +++ b/src/pt/mangavibe/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'pt.mangavibe' extClass = '.MangaVibe' extVersionCode = 1 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/mangavibe/src/eu/kanade/tachiyomi/extension/pt/mangavibe/MangaVibe.kt b/src/pt/mangavibe/src/eu/kanade/tachiyomi/extension/pt/mangavibe/MangaVibe.kt index 3cb7bb1df..7fb749af2 100644 --- a/src/pt/mangavibe/src/eu/kanade/tachiyomi/extension/pt/mangavibe/MangaVibe.kt +++ b/src/pt/mangavibe/src/eu/kanade/tachiyomi/extension/pt/mangavibe/MangaVibe.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.mangavibe -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess @@ -29,7 +28,6 @@ import java.util.Locale import java.util.concurrent.TimeUnit import kotlin.math.ceil -@Nsfw class MangaVibe : HttpSource() { override val name = "MangaVibe" diff --git a/src/pt/muitomanga/build.gradle b/src/pt/muitomanga/build.gradle index 1db14e8db..e61641ef9 100644 --- a/src/pt/muitomanga/build.gradle +++ b/src/pt/muitomanga/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'pt.muitomanga' extClass = '.MuitoManga' extVersionCode = 5 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/muitomanga/src/eu/kanade/tachiyomi/extension/pt/muitomanga/MuitoManga.kt b/src/pt/muitomanga/src/eu/kanade/tachiyomi/extension/pt/muitomanga/MuitoManga.kt index 7bf0948b5..0213757d4 100644 --- a/src/pt/muitomanga/src/eu/kanade/tachiyomi/extension/pt/muitomanga/MuitoManga.kt +++ b/src/pt/muitomanga/src/eu/kanade/tachiyomi/extension/pt/muitomanga/MuitoManga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.muitomanga -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList @@ -28,7 +27,6 @@ import java.util.Locale import java.util.concurrent.TimeUnit import kotlin.math.ceil -@Nsfw class MuitoManga : ParsedHttpSource() { override val name = "Muito Mangá" diff --git a/src/pt/mundomangakun/build.gradle b/src/pt/mundomangakun/build.gradle index ab2d1c6a8..0c452613c 100644 --- a/src/pt/mundomangakun/build.gradle +++ b/src/pt/mundomangakun/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'pt.mundomangakun' extClass = '.MundoMangaKun' extVersionCode = 6 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt b/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt index ea3a3c192..5707d473d 100644 --- a/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt +++ b/src/pt/mundomangakun/src/eu/kanade/tachiyomi/extension/pt/mundomangakun/MundoMangaKun.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.mundomangakun -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter @@ -23,7 +22,6 @@ import org.jsoup.nodes.Element import uy.kohesive.injekt.injectLazy import java.util.concurrent.TimeUnit -@Nsfw class MundoMangaKun : ParsedHttpSource() { override val name = "Mundo Mangá-Kun" diff --git a/src/pt/taosect/build.gradle b/src/pt/taosect/build.gradle index 6169867e2..5e8d1ca78 100644 --- a/src/pt/taosect/build.gradle +++ b/src/pt/taosect/build.gradle @@ -7,7 +7,7 @@ ext { pkgNameSuffix = 'pt.taosect' extClass = '.TaoSect' extVersionCode = 12 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt b/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt index 6c5099389..71a6777b1 100644 --- a/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt +++ b/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.pt.taosect -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST @@ -28,7 +27,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -@Nsfw class TaoSect : HttpSource() { override val name = "Tao Sect" diff --git a/src/ru/allhentai/build.gradle b/src/ru/allhentai/build.gradle index 7fc76ce23..eff2501b5 100644 --- a/src/ru/allhentai/build.gradle +++ b/src/ru/allhentai/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ru.allhentai' extClass = '.AllHentai' extVersionCode = 12 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt index 4ef696bf9..7ad44825e 100644 --- a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt +++ b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt @@ -4,7 +4,6 @@ import android.app.Application import android.content.SharedPreferences import android.widget.Toast import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess @@ -31,7 +30,6 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.regex.Pattern -@Nsfw class AllHentai : ConfigurableSource, ParsedHttpSource() { private val preferences: SharedPreferences by lazy { diff --git a/src/ru/henchan/build.gradle b/src/ru/henchan/build.gradle index f08195994..cf5c6db7d 100644 --- a/src/ru/henchan/build.gradle +++ b/src/ru/henchan/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ru.henchan' extClass = '.Henchan' extVersionCode = 26 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt b/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt index 3786c0818..9b1e504b0 100644 --- a/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt +++ b/src/ru/henchan/src/eu/kanade/tachiyomi/extension/ru/henchan/Henchan.kt @@ -7,7 +7,6 @@ import com.github.salomonbrys.kotson.string import com.google.gson.Gson import com.google.gson.JsonArray import com.google.gson.JsonObject -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservable @@ -30,7 +29,6 @@ import java.text.SimpleDateFormat import java.util.Date import java.util.Locale -@Nsfw class Henchan : ParsedHttpSource() { override val name = "Henchan" diff --git a/src/ru/nudemoon/build.gradle b/src/ru/nudemoon/build.gradle index 16b96e53c..f13027560 100644 --- a/src/ru/nudemoon/build.gradle +++ b/src/ru/nudemoon/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ru.nudemoon' extClass = '.Nudemoon' extVersionCode = 7 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt b/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt index 6590b632a..4e558e85d 100644 --- a/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt +++ b/src/ru/nudemoon/src/eu/kanade/tachiyomi/extension/ru/nudemoon/Nudemoon.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.ru.nudemoon -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -17,7 +16,6 @@ import java.net.URLEncoder import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Nudemoon : ParsedHttpSource() { override val name = "Nude-Moon" diff --git a/src/ru/yaoichan/build.gradle b/src/ru/yaoichan/build.gradle index b2e0e5d2f..a0f7d6283 100644 --- a/src/ru/yaoichan/build.gradle +++ b/src/ru/yaoichan/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'ru.yaoichan' extClass = '.Yaoichan' extVersionCode = 1 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt b/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt index 809442f6a..f61f2072d 100644 --- a/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt +++ b/src/ru/yaoichan/src/eu/kanade/tachiyomi/extension/ru/yaoichan/Yaoichan.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.ru.yaoichan -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter @@ -17,7 +16,6 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class Yaoichan : ParsedHttpSource() { override val name = "Yaoichan" diff --git a/src/vi/hentaivn/build.gradle b/src/vi/hentaivn/build.gradle index 51de35e25..9fd2086f5 100644 --- a/src/vi/hentaivn/build.gradle +++ b/src/vi/hentaivn/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'vi.hentaivn' extClass = '.HentaiVN' extVersionCode = 9 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt index ce48ab6a2..8855d0d75 100644 --- a/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt +++ b/src/vi/hentaivn/src/eu/kanade/tachiyomi/extension/vi/hentaivn/HentaiVN.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.vi.hentaivn -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList @@ -22,7 +21,6 @@ import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale -@Nsfw class HentaiVN : ParsedHttpSource() { override val baseUrl = "https://hentaivn.tv" diff --git a/src/zh/jinmantiantang/build.gradle b/src/zh/jinmantiantang/build.gradle index d81e7a4b7..1f1b41008 100644 --- a/src/zh/jinmantiantang/build.gradle +++ b/src/zh/jinmantiantang/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'zh.jinmantiantang' extClass = '.Jinmantiantang' extVersionCode = 16 - containsNsfw = true + isNsfw = true } dependencies { diff --git a/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt b/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt index 928a6b4f7..5b549774a 100644 --- a/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt +++ b/src/zh/jinmantiantang/src/eu/kanade/tachiyomi/extension/zh/jinmantiantang/Jinmantiantang.kt @@ -8,7 +8,6 @@ import android.graphics.Canvas import android.graphics.Rect import androidx.preference.EditTextPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess @@ -42,7 +41,6 @@ import java.text.SimpleDateFormat import java.util.Locale import kotlin.math.floor -@Nsfw class Jinmantiantang : ConfigurableSource, ParsedHttpSource() { override val lang: String = "zh" diff --git a/src/zh/wnacg/build.gradle b/src/zh/wnacg/build.gradle index dff174619..7c892420c 100644 --- a/src/zh/wnacg/build.gradle +++ b/src/zh/wnacg/build.gradle @@ -6,7 +6,7 @@ ext { pkgNameSuffix = 'zh.wnacg' extClass = '.wnacg' extVersionCode = 6 - containsNsfw = true + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt b/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt index 53ede5942..e3cd69c33 100644 --- a/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt +++ b/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.zh.wnacg -import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.Filter @@ -18,7 +17,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable -@Nsfw class wnacg : ParsedHttpSource() { override val name = "紳士漫畫" override val baseUrl = "https://www.wnacg.org"