diff --git a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt index 809b2bc88..563bf9d97 100644 --- a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt +++ b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt @@ -1,8 +1,20 @@ package eu.kanade.tachiyomi.extension.en.firstkissmanga +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.Headers +import java.util.concurrent.TimeUnit -class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.io", "en") { +class FirstKissManga : Madara( + "1st Kiss", + "https://1stkissmanga.io", + "en" +) { override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl) + + private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS) + + override val client = network.cloudflareClient.newBuilder() + .addNetworkInterceptor(rateLimitInterceptor) + .build() } diff --git a/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt b/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt new file mode 100644 index 000000000..0a9d48e36 --- /dev/null +++ b/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt @@ -0,0 +1,17 @@ +package eu.kanade.tachiyomi.extension.en.firstkissmangaclub + +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.util.concurrent.TimeUnit + +class FirstKissMangaClub : Madara( + "1stKissManga.Club", + "https://1stkissmanga.club", + "en" +) { + private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS) + + override val client = network.cloudflareClient.newBuilder() + .addNetworkInterceptor(rateLimitInterceptor) + .build() +} diff --git a/multisrc/overrides/madara/firstkissmangalove/src/FirstKissMangaLove.kt b/multisrc/overrides/madara/firstkissmangalove/src/FirstKissMangaLove.kt new file mode 100644 index 000000000..3809f2d11 --- /dev/null +++ b/multisrc/overrides/madara/firstkissmangalove/src/FirstKissMangaLove.kt @@ -0,0 +1,17 @@ +package eu.kanade.tachiyomi.extension.en.firstkissmangalove + +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.util.concurrent.TimeUnit + +class FirstKissMangaLove : Madara( + "1st Kiss Manga.love", + "https://1stkissmanga.love", + "en" +) { + private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS) + + override val client = network.cloudflareClient.newBuilder() + .addNetworkInterceptor(rateLimitInterceptor) + .build() +} diff --git a/multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt b/multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt index 897e5ab54..ff488d514 100644 --- a/multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt +++ b/multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt @@ -1,12 +1,25 @@ package eu.kanade.tachiyomi.extension.en.firstkissmanhua +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Page import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale +import java.util.concurrent.TimeUnit + +class FirstKissManhua : Madara( + "1st Kiss Manhua", + "https://1stkissmanhua.com", + "en", + SimpleDateFormat("d MMM yyyy", Locale.US) +) { + private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS) + + override val client = network.cloudflareClient.newBuilder() + .addNetworkInterceptor(rateLimitInterceptor) + .build() -class FirstKissManhua : Madara("1st Kiss Manhua", "https://1stkissmanhua.com", "en", SimpleDateFormat("d MMM yyyy", Locale.US)) { override fun imageRequest(page: Page): Request = GET(page.imageUrl!!, headersBuilder().add("Referer", "https://1stkissmanga.com").build()) } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index f2e4457c8..62748d605 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -19,10 +19,10 @@ class MadaraGenerator : ThemeSourceGenerator { MultiLang("Reaper Scans", "https://reaperscans.com", listOf("en", "pt-BR"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 4), MultiLang("Seven King Scanlation", "https://sksubs.net", listOf("es", "en"), isNsfw = true), MultiLang("YugenMangas", "https://yugenmangas.com", listOf("es", "pt-BR"), overrideVersionCode = 2), - SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove"), - SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua", overrideVersionCode = 2), - SingleLang("1st Kiss", "https://1stkissmanga.io", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 6), - SingleLang("1stKissManga.Club", "https://1stkissmanga.club", "en", className = "FirstKissMangaClub"), + SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove", overrideVersionCode = 1), + SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua", overrideVersionCode = 3), + SingleLang("1st Kiss", "https://1stkissmanga.io", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 7), + SingleLang("1stKissManga.Club", "https://1stkissmanga.club", "en", className = "FirstKissMangaClub", overrideVersionCode = 1), SingleLang("247Manga", "https://247manga.com", "en", className = "Manga247", overrideVersionCode = 1), SingleLang("24hManga", "https://24hmanga.com", "en", isNsfw = true, className = "TwentyFourhManga"), SingleLang("24hRomance", "https://24hromance.com", "en", className = "Romance24h"),