Remove usage of @Nsfw annotation in favor of extension-level flagging (#9368)

.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

CONTRIBUTING.md

@@ -78,7 +78,7 @@ ext {
     pkgNameSuffix = '<lang>.<mysourcename>'
     extClass = '.<MySourceName>'
     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`.
 

annotations/build.gradle.kts

@@ -1,7 +0,0 @@
-plugins {
-    id("kotlin")
-}
-
-dependencies {
-    compileOnly(Dependencies.kotlin.stdlib)
-}

annotations/src/main/kotlin/Nsfw.kt

@@ -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

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')
 }

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,
         ]
     }
 

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")

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"

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")) {

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 {

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

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",

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",

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",

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",

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)

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)

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",

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",

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",

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(

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",

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
 }

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"

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
 }

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",

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",

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()

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",

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",

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",

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()

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()

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",

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))

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")

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",

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",

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"),

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/",

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",

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")))

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",

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<SChapter> = super.chapterListParse(response).reversed()
 }

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",

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")

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",

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(

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",

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,

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")

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
 }

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))

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",

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<SChapter> = super.chapterListParse(response).reversed()

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")

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()

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()

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
 }

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))

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",

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",

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)

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

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))

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

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

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",

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",

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 {

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)

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",

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")

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",

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")

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",

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))

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")

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",

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",

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",

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")))

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")

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",

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")

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",

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))

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<Genre> = listOf(
         Genre("Action", "action-webtoon"),

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")

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))

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))

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))

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")

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")

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")

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",

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)

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")

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",

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))