Refactor to use app-provided rate limiting interceptors (#12089)

lib/ratelimit/build.gradle.kts

@@ -1,22 +0,0 @@
-plugins {
-    id("com.android.library")
-    kotlin("android")
-}
-
-android {
-    compileSdk = AndroidConfig.compileSdk
-
-    defaultConfig {
-        minSdk = AndroidConfig.minSdk
-        targetSdk = AndroidConfig.targetSdk
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compileOnly(libs.kotlin.stdlib)
-    compileOnly(libs.okhttp)
-}

lib/ratelimit/src/main/AndroidManifest.xml

@@ -1,3 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.kanade.tachiyomi.lib.ratelimit">
-</manifest>

lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/RateLimitInterceptor.kt

@@ -1,58 +0,0 @@
-package eu.kanade.tachiyomi.lib.ratelimit
-
-import android.os.SystemClock
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.util.concurrent.TimeUnit
-
-/**
- * An OkHttp interceptor that handles rate limiting.
- *
- * Examples:
- *
- * permits = 5,  period = 1, unit = seconds  =>  5 requests per second
- * permits = 10, period = 2, unit = minutes  =>  10 requests per 2 minutes
- *
- * @param permits {Int}   Number of requests allowed within a period of units.
- * @param period {Long}   The limiting duration. Defaults to 1.
- * @param unit {TimeUnit} The unit of time for the period. Defaults to seconds.
- */
-class RateLimitInterceptor(
-        private val permits: Int,
-        private val period: Long = 1,
-        private val unit: TimeUnit = TimeUnit.SECONDS) : Interceptor {
-
-    private val requestQueue = ArrayList<Long>(permits)
-    private val rateLimitMillis = unit.toMillis(period)
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        synchronized(requestQueue) {
-            val now = SystemClock.elapsedRealtime()
-            val waitTime = if (requestQueue.size < permits) {
-                0
-            } else {
-                val oldestReq = requestQueue[0]
-                val newestReq = requestQueue[permits - 1]
-
-                if (newestReq - oldestReq > rateLimitMillis) {
-                    0
-                } else {
-                    oldestReq + rateLimitMillis - now // Remaining time
-                }
-            }
-
-            if (requestQueue.size == permits) {
-                requestQueue.removeAt(0)
-            }
-            if (waitTime > 0) {
-                requestQueue.add(now + waitTime)
-                Thread.sleep(waitTime) // Sleep inside synchronized to pause queued requests
-            } else {
-                requestQueue.add(now)
-            }
-        }
-
-        return chain.proceed(chain.request())
-    }
-
-}

lib/ratelimit/src/main/java/eu/kanade/tachiyomi/lib/ratelimit/SpecificHostRateLimitInterceptor.kt

@@ -1,65 +0,0 @@
-package eu.kanade.tachiyomi.lib.ratelimit
-
-import android.os.SystemClock
-import okhttp3.HttpUrl
-import okhttp3.Interceptor
-import okhttp3.Response
-import java.util.concurrent.TimeUnit
-
-/**
- * An OkHttp interceptor that handles given url host's rate limiting.
- *
- * Examples:
- *
- * httpUrl = "api.manga.com".toHttpUrlOrNull(), permits = 5, period = 1, unit = seconds  =>  5 requests per second to api.manga.com
- * httpUrl = "imagecdn.manga.com".toHttpUrlOrNull(), permits = 10, period = 2, unit = minutes  =>  10 requests per 2 minutes to imagecdn.manga.com
- *
- * @param httpUrl {HttpUrl} The url host that this interceptor should handle. Will get url's host by using HttpUrl.host()
- * @param permits {Int}   Number of requests allowed within a period of units.
- * @param period {Long}   The limiting duration. Defaults to 1.
- * @param unit {TimeUnit} The unit of time for the period. Defaults to seconds.
- */
-class SpecificHostRateLimitInterceptor(
-        private val httpUrl: HttpUrl,
-        private val permits: Int,
-        private val period: Long = 1,
-        private val unit: TimeUnit = TimeUnit.SECONDS
-) : Interceptor {
-
-    private val requestQueue = ArrayList<Long>(permits)
-    private val rateLimitMillis = unit.toMillis(period)
-    private val host = httpUrl.host
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        if (chain.request().url.host != host) {
-            return chain.proceed(chain.request())
-        }
-        synchronized(requestQueue) {
-            val now = SystemClock.elapsedRealtime()
-            val waitTime = if (requestQueue.size < permits) {
-                0
-            } else {
-                val oldestReq = requestQueue[0]
-                val newestReq = requestQueue[permits - 1]
-
-                if (newestReq - oldestReq > rateLimitMillis) {
-                    0
-                } else {
-                    oldestReq + rateLimitMillis - now // Remaining time
-                }
-            }
-
-            if (requestQueue.size == permits) {
-                requestQueue.removeAt(0)
-            }
-            if (waitTime > 0) {
-                requestQueue.add(now + waitTime)
-                Thread.sleep(waitTime) // Sleep inside synchronized to pause queued requests
-            } else {
-                requestQueue.add(now)
-            }
-        }
-
-        return chain.proceed(chain.request())
-    }
-}

multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt

@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.extension.all.bilibilicomics
 
-import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.bilibili.Bilibili
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliAccessToken
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliAccessTokenCookie
@@ -12,6 +11,7 @@ import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliTag
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliUnlockedEpisode
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliUserEpisodes
 import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
@@ -46,9 +46,9 @@ abstract class BilibiliComics(lang: String) : Bilibili(
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(::signedInIntercept)
         .addInterceptor(::expiredTokenIntercept)
-        .addInterceptor(SpecificHostRateLimitInterceptor(baseUrl.toHttpUrl(), 1))
+        .rateLimitHost(baseUrl.toHttpUrl(), 1)
-        .addInterceptor(SpecificHostRateLimitInterceptor(CDN_URL.toHttpUrl(), 2))
+        .rateLimitHost(CDN_URL.toHttpUrl(), 2)
-        .addInterceptor(SpecificHostRateLimitInterceptor(COVER_CDN_URL.toHttpUrl(), 2))
+        .rateLimitHost(COVER_CDN_URL.toHttpUrl(), 2)
         .build()
 
     override val signedIn: Boolean

multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt

@@ -1,10 +1,10 @@
 package eu.kanade.tachiyomi.extension.zh.bilibilimanga
 
-import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.bilibili.Bilibili
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliComicDto
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliIntl
 import eu.kanade.tachiyomi.multisrc.bilibili.BilibiliTag
+import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
 import eu.kanade.tachiyomi.source.model.SChapter
 import okhttp3.Headers
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -21,9 +21,9 @@ class BilibiliManga : Bilibili(
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(::expiredTokenIntercept)
-        .addInterceptor(SpecificHostRateLimitInterceptor(baseUrl.toHttpUrl(), 1))
+        .rateLimitHost(baseUrl.toHttpUrl(), 1)
-        .addInterceptor(SpecificHostRateLimitInterceptor(CDN_URL.toHttpUrl(), 2))
+        .rateLimitHost(CDN_URL.toHttpUrl(), 2)
-        .addInterceptor(SpecificHostRateLimitInterceptor(COVER_CDN_URL.toHttpUrl(), 2))
+        .rateLimitHost(COVER_CDN_URL.toHttpUrl(), 2)
         .build()
 
     override fun headersBuilder() = Headers.Builder().apply {

multisrc/overrides/bilibili/default/additional.gradle.kts

@@ -1,4 +0,0 @@
-
-dependencies {
-    implementation project(':lib-ratelimit')
-}

multisrc/overrides/foolslide/baixarhentai/src/BaixarHentai.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.baixarhentai
 
 import androidx.preference.PreferenceScreen
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.foolslide.FoolSlide
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.SManga
 import org.jsoup.nodes.Document
 import java.util.concurrent.TimeUnit
@@ -12,7 +12,7 @@ class BaixarHentai : FoolSlide("Baixar Hentai", "https://leitura.baixarhentai.ne
     override val id = 8908032188831949972
 
     override val client = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun mangaDetailsParse(document: Document) = SManga.create().apply {

multisrc/overrides/foolslide/default/additional.gradle.kts

@@ -1,4 +0,0 @@
-
-dependencies {
-    implementation project(':lib-ratelimit')
-}

multisrc/overrides/foolslide/hentaitokyo/src/HentaiTokyo.kt

@@ -1,17 +0,0 @@
-package eu.kanade.tachiyomi.extension.pt.hentaitokyo
-
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
-import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu
-import okhttp3.OkHttpClient
-import java.util.concurrent.TimeUnit
-
-class HentaiTokyo : Gattsu(
-    "Hentai Tokyo",
-    "https://hentaitokyo.net",
-    "pt-BR"
-) {
-
-    override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
-        .build()
-}

multisrc/overrides/gattsu/default/additional.gradle.kts

@@ -1,4 +0,0 @@
-
-dependencies {
-    implementation project(':lib-ratelimit')
-}

multisrc/overrides/gattsu/hentaiseason/src/HentaiSeason.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.hentaiseason
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
@@ -12,6 +12,6 @@ class HentaiSeason : Gattsu(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/gattsu/hentaitokyo/src/HentaiTokyo.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.hentaitokyo
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
@@ -12,6 +12,6 @@ class HentaiTokyo : Gattsu(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/gattsu/universohentai/src/UniversoHentai.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.universohentai
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.gattsu.Gattsu
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.util.asJsoup
@@ -18,7 +18,7 @@ class UniversoHentai : Gattsu(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun latestUpdatesSelector() = "div.meio div.videos div.video a[href^=$baseUrl]:not(:has(span.selo-hd))"

multisrc/overrides/madara/aiinscan/src/AiinScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.aiinscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class AiinScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint: Boolean = true

multisrc/overrides/madara/akumanotenshi/src/AkumaNoTenshi.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.akumanotenshi
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class AkumaNoTenshi : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.animecenterscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class AnimeCenterScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/arthurscan/src/ArthurScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.arthurscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class ArthurScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.bananamecanica
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -18,6 +18,6 @@ class BananaCitrica : Madara(
     override val id: Long = 4770070980248873010
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/blmanhwaclub/src/BlManhwaClub.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.blmanhwaclub
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class BlManhwaClub : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.borutoexplorer
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class BorutoExplorer : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/cafecomyaoi/src/CafeComYaoi.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.cafecomyaoi
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class CafeComYaoi : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/cerisescans/src/CeriseScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.cerisescans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class CeriseScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/covenscan/src/CovenScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.covenscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class CovenScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/cronosscan/src/CronosScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.cronosscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class CronosScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/darkyurealm/src/DarkYueRealm.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.darkyurealm
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.SManga
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -21,7 +21,7 @@ class DarkYueRealm : Madara(
     override val id: Long = 593455310609863709
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun mangaDetailsRequest(manga: SManga): Request {

multisrc/overrides/madara/default/additional.gradle.kts

@@ -1,4 +0,0 @@
-
-dependencies {
-    implementation project(':lib-ratelimit')
-}

multisrc/overrides/madara/diskusscan/src/DiskusScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.diskusscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class DiskusScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/dreamunionscan/src/DreamUnionScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.dreamunionscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
@@ -19,7 +19,7 @@ class DreamUnionScan : Madara(
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(::authWarningIntercept)
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     private fun authWarningIntercept(chain: Interceptor.Chain): Response {

multisrc/overrides/madara/dropescan/src/DropeScan.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.dropescan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.text.SimpleDateFormat
@@ -17,7 +17,7 @@ class DropeScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/estufadecristal/src/EstufaDeCristal.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.estufadecristal
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.SChapter
 import okhttp3.OkHttpClient
 import okhttp3.Response
@@ -17,7 +17,7 @@ class EstufaDeCristal : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/fdmscan/src/FDMScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.fdmscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class FDMScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/finalscans/src/FinalScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.finalscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class FinalScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.firstkissmanga
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Headers
 import java.util.concurrent.TimeUnit
 
@@ -12,9 +12,7 @@ class FirstKissManga : Madara(
 ) {
     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)
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.firstkissmangaclub
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import java.util.concurrent.TimeUnit
 
 class FirstKissMangaClub : Madara(
@@ -9,9 +9,8 @@ class FirstKissMangaClub : Madara(
     "https://1stkissmanga.club",
     "en"
 ) {
-    private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS)
 
     override val client = network.cloudflareClient.newBuilder()
-        .addNetworkInterceptor(rateLimitInterceptor)
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/firstkissmangalove/src/FirstKissMangaLove.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.firstkissmangalove
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import java.util.concurrent.TimeUnit
 
 class FirstKissMangaLove : Madara(
@@ -9,9 +9,8 @@ class FirstKissMangaLove : Madara(
     "https://1stkissmanga.love",
     "en"
 ) {
-    private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS)
 
     override val client = network.cloudflareClient.newBuilder()
-        .addNetworkInterceptor(rateLimitInterceptor)
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/firstkissmanhua/src/FirstKissManhua.kt

@@ -1,8 +1,8 @@
 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.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.Page
 import okhttp3.Request
 import java.text.SimpleDateFormat
@@ -15,10 +15,9 @@ class FirstKissManhua : Madara(
     "en",
     SimpleDateFormat("d MMM yyyy", Locale.US)
 ) {
-    private val rateLimitInterceptor = RateLimitInterceptor(1, 2, TimeUnit.SECONDS)
 
     override val client = network.cloudflareClient.newBuilder()
-        .addNetworkInterceptor(rateLimitInterceptor)
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun imageRequest(page: Page): Request = GET(page.imageUrl!!, headersBuilder().add("Referer", "https://1stkissmanga.com").build())

multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.fleurblanche
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
@@ -20,7 +20,7 @@ class FleurBlanche : Madara(
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(::authWarningIntercept)
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/foxwhite/src/FoxWhite.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.foxwhite
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class FoxWhite : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/freemanga/src/FreeManga.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.en.freemanga
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class FreeManga : Madara("Free Manga", "https://freemanga.me", "en") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/furioscans/src/FurioScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.furioscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class FurioScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/glasssky/src/GlassSky.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.glasssky
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class GlassSky : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/gooffansub/src/GoofFansub.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.gooffansub
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class GoofFansub : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val popularMangaUrlSelector = "div.post-title a:last-child"

multisrc/overrides/madara/helascan/src/HelaScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.helascan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class HelaScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/hentai20/src/Hentai20.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.en.hentai20
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class Hentai20 : Madara("Hentai20", "https://hentai20.com", "en") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.en.hentaidexy
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class Hentaidexy : Madara("Hentaidexy", "https://hentaidexy.com", "en") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.hentaiteca
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
@@ -16,7 +16,7 @@ class HentaiTeca : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun headersBuilder(): Headers.Builder = Headers.Builder()

multisrc/overrides/madara/hipercool/src/Hipercool.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.hipercool
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
@@ -11,6 +11,6 @@ class Hipercool : Madara("HipercooL", "https://hipercool.xyz", "pt-BR") {
     override val versionId = 2
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/huntersscan/src/HuntersScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.huntersscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class HuntersScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/ichirinnohanayuri/src/IchirinNoHanaYuri.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.ichirinnohanayuri
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Headers
 import okhttp3.OkHttpClient
 import java.io.IOException
@@ -17,7 +17,7 @@ class IchirinNoHanaYuri : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .addInterceptor { chain ->
             val response = chain.proceed(chain.request())
 

multisrc/overrides/madara/imperioscans/src/ImperioScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.imperioscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class ImperioScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.kamisamaexplorer
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class KamiSamaExplorer : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/limascans/src/LimaScans.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.limascans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.SManga
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -18,7 +18,7 @@ class LimaScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override fun mangaDetailsRequest(manga: SManga): Request {

multisrc/overrides/madara/littlemonsterscan/src/LittleMonsterScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.littlemonsterscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class LittleMonsterScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val altName: String = "Nome alternativo: "

multisrc/overrides/madara/mangaclash/src/MangaClash.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.mangaclash
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class MangaClash : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/mangafenix/src/MangaFenix.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.es.mangafenix
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -14,6 +14,6 @@ class MangaFenix : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1))
+        .rateLimit(1)
         .build()
 }

multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.all.mangaforfree
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import okhttp3.OkHttpClient
@@ -29,6 +29,6 @@ abstract class MangaForFree(
 ) : Madara(name, baseUrl, lang) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/mangakomi/src/MangaKomi.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.mangakomi
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
@@ -12,6 +12,6 @@ class MangaKomi : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/mangatuli/src/MangaTuli.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.en.mangatuli
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class MangaTuli : Madara("MangaTuli", "https://mangatuli.com", "en") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/manhuapro/src/ManhuaPro.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.manhuapro
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
@@ -12,6 +12,6 @@ class ManhuaPro : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/markscans/src/MarkScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.markscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class MarkScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/mhentais/src/MHentais.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.mhentais
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class MHentais : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.minitwoscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class MiniTwoScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/miradscanlator/src/MiradScanlator.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.miradscanlator
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class MiradScanlator : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.momonohanascan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class MomoNoHanaScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/nekobreakerscan/src/NekoBreakerScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.nekobreakerscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class NekoBreakerScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/neoxscanlator/src/NeoxScanlator.kt

@@ -6,11 +6,11 @@ import android.widget.Toast
 import androidx.preference.EditTextPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.AppInfo
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservable
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
@@ -50,7 +50,7 @@ class NeoxScanlator :
         .readTimeout(1, TimeUnit.MINUTES)
         .addInterceptor(::titleCollectionIntercept)
         .addInterceptor(::obsoleteCheckIntercept)
-        .addInterceptor(RateLimitInterceptor(1, 3, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val altNameSelector = ".post-content_item:contains(Alternativo) .summary-content"

multisrc/overrides/madara/ninjascan/src/NinjaScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.ninjascan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class NinjaScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/owscan/src/OwScan.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.pt.owscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class OwScan : Madara("Ow Scan", "https://owscan.com", "pt-BR") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/pirulitorosa/src/PirulitoRosa.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.pirulitorosa
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class PirulitoRosa : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val popularMangaUrlSelector = "div.post-title a:last-child"

multisrc/overrides/madara/prismahentais/src/PrismaHentais.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.prismahentais
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class PrismaHentais : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/prismascans/src/PrismaScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.prismascans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class PrismaScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/projetoscanlator/src/ProjetoScanlator.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.projetoscanlator
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class ProjetoScanlator : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/randomscan/src/RandomScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.randomscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class RandomScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.all.reaperscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.model.SChapter
 import okhttp3.HttpUrl.Companion.toHttpUrl
@@ -62,7 +62,7 @@ class ReaperScansBr : ReaperScans(
     override val id = 7767018058145795388
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }
 

multisrc/overrides/madara/remangas/src/Remangas.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.remangas
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -18,6 +18,6 @@ class Remangas : Madara(
     override val useNewChapterEndpoint = true
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/rwbyscan/src/RwbyScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.rwbyscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class RwbyScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/seikouscans/src/SeikouScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.seikouscans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class SeikouScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.sensainayuri
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class SensainaYuri : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt

@@ -1,17 +1,16 @@
 package eu.kanade.tachiyomi.extension.en.shieldmanga
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class ShieldManga : Madara("Shield Manga", "https://shieldmanga.io", "en") {
-    private val rateLimitInterceptor = RateLimitInterceptor(1)
 
     override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .connectTimeout(10, TimeUnit.SECONDS)
         .readTimeout(30, TimeUnit.SECONDS)
-        .addNetworkInterceptor(rateLimitInterceptor)
+        .rateLimit(1)
         .build()
 
     // The website does not flag the content.

multisrc/overrides/madara/shinzooscan/src/ShinzooScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.shinzooscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class ShinzooScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/sinensis/src/Sinensis.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.sinensis
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class Sinensis : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/smashscan/src/SmashScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.smashscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class SmashScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val altName = "Nome alternativo: "

multisrc/overrides/madara/sodascan/src/SodaScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.sodascan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class SodaScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.sweettimescan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.MangasPage
 import okhttp3.OkHttpClient
 import okhttp3.Response
@@ -18,7 +18,7 @@ class SweetTimeScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     // The source has novels in text format, so we need to filter them.

multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.tatakaescan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class TatakaeScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/thesugar/src/TheSugar.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.thesugar
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class TheSugar : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/threequeensscanlator/src/ThreeQueensScanlator.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.threequeensscanlator
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class ThreeQueensScanlator : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/vapohentai/src/VapoHentai.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.vapohentai
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class VapoHentai : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/vaposcan/src/VapoScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.vaposcan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -18,7 +18,7 @@ class VapoScan : Madara(
     override val versionId = 2
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     override val useNewChapterEndpoint = true

multisrc/overrides/madara/visbellum/src/Visbellum.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.visbellum
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class Visbellum : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/warqueenscan/src/WarQueenScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.warqueenscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,7 +15,7 @@ class WarQueenScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .connectTimeout(1, TimeUnit.MINUTES)
         .readTimeout(1, TimeUnit.MINUTES)
         .writeTimeout(1, TimeUnit.MINUTES)

multisrc/overrides/madara/winterscan/src/WinterScan.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.winterscan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class WinterScan : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.extension.en.yaoimanga
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
 class YaoiManga : Madara("Yaoi.mobi", "https://yaoi.mobi", "en") {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS))
+        .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/yaoitoshokan/src/YaoiToshokan.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.pt.yaoitoshokan
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.model.Page
 import okhttp3.Headers
 import okhttp3.OkHttpClient
@@ -23,7 +23,7 @@ class YaoiToshokan : Madara(
         .removeAll("User-Agent")
 
     override val client: OkHttpClient = network.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 
     // Page has custom link to scan website.

multisrc/overrides/madara/yugenmangas/src/YugenMangasFactory.kt

@@ -1,8 +1,8 @@
 package eu.kanade.tachiyomi.extension.all.yugenmangas
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.util.asJsoup
@@ -50,7 +50,7 @@ class YugenMangasBr : YugenMangas(
 
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(::uaIntercept)
-        .addInterceptor(RateLimitInterceptor(1, 3, TimeUnit.SECONDS))
+        .rateLimit(1, 3, TimeUnit.SECONDS)
         .build()
 
     override fun headersBuilder(): Headers.Builder = Headers.Builder()

multisrc/overrides/madara/yuriverso/src/YuriVerso.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.yuriverso
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class YuriVerso : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madara/zombielandsagascans/src/ZombieLandSagaScans.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.pt.zombielandsagascans
 
-import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madara.Madara
+import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.OkHttpClient
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -15,6 +15,6 @@ class ZombieLandSagaScans : Madara(
 ) {
 
     override val client: OkHttpClient = super.client.newBuilder()
-        .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
+        .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 }

multisrc/overrides/madtheme/beehentai/src/BeeHentai.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.beehentai
 
-import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -12,45 +12,35 @@ class BeeHentai : MadTheme(
     "en"
 ) {
     override val client: OkHttpClient = network.cloudflareClient.newBuilder()
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv1.xyz".toHttpUrl(),
-                "https://s1.mbcdnv1.xyz".toHttpUrl(),
+            5,
-                5,
+            1,
-                1,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv2.xyz".toHttpUrl(),
-                "https://s1.mbcdnv2.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv3.xyz".toHttpUrl(),
-                "https://s1.mbcdnv3.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv4.xyz".toHttpUrl(),
-                "https://s1.mbcdnv4.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv5.xyz".toHttpUrl(),
-                "https://s1.mbcdnv5.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
         .build()
 }

multisrc/overrides/madtheme/boxmanhwa/src/BoxManhwa.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.extension.en.boxmanhwa
 
-import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor
 import eu.kanade.tachiyomi.multisrc.madtheme.MadTheme
+import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
@@ -12,45 +12,35 @@ class BoxManhwa : MadTheme(
     "en"
 ) {
     override val client: OkHttpClient = network.cloudflareClient.newBuilder()
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv1.xyz".toHttpUrl(),
-                "https://s1.mbcdnv1.xyz".toHttpUrl(),
+            5,
-                5,
+            1,
-                1,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv2.xyz".toHttpUrl(),
-                "https://s1.mbcdnv2.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv3.xyz".toHttpUrl(),
-                "https://s1.mbcdnv3.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv4.xyz".toHttpUrl(),
-                "https://s1.mbcdnv4.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
-        .addInterceptor(
+        .rateLimitHost(
-            SpecificHostRateLimitInterceptor(
+            "https://s1.mbcdnv5.xyz".toHttpUrl(),
-                "https://s1.mbcdnv5.xyz".toHttpUrl(),
+            1,
-                1,
+            2,
-                2,
+            TimeUnit.SECONDS
-                TimeUnit.SECONDS
-            )
         )
         .build()
 }