From 1658c0106f47d6cf3134d0928337c8cfcaf9c220 Mon Sep 17 00:00:00 2001
From: Ejan <35057681+e-shl@users.noreply.github.com>
Date: Fri, 24 Jun 2022 07:24:26 +0500
Subject: [PATCH] [RU]LibGroup ratelimits half rollback (#12288)
---
multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt | 6 ------
multisrc/overrides/libgroup/mangalib/src/MangaLib.kt | 6 ------
.../eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt | 2 +-
.../java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt | 1 +
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt b/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt
index 364fe9481..39a186dfa 100644
--- a/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt
+++ b/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt
@@ -2,11 +2,9 @@ package eu.kanade.tachiyomi.extension.ru.hentailib
import eu.kanade.tachiyomi.multisrc.libgroup.LibGroup
import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList
import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
@@ -15,10 +13,6 @@ class HentaiLib : LibGroup("HentaiLib", "https://hentailib.me", "ru") {
override val id: Long = 6425650164840473547
override val client: OkHttpClient = super.client.newBuilder()
- .rateLimitHost(baseUrl.toHttpUrl(),10) //source
- .rateLimitHost("https://img2.hentailib.org".toHttpUrl(),1) //secondary
- .rateLimitHost("https://img4.hentailib.org".toHttpUrl(),1) //fourth
- .rateLimitHost("https://img3.hentailib.org".toHttpUrl(),1) //compress
.addInterceptor(::imageContentTypeIntercept)
.build()
diff --git a/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt b/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt
index e05248ede..b2b60ee5e 100644
--- a/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt
+++ b/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt
@@ -7,11 +7,9 @@ import androidx.preference.ListPreference
import androidx.preference.PreferenceScreen
import eu.kanade.tachiyomi.multisrc.libgroup.LibGroup
import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.network.interceptor.rateLimitHost
import eu.kanade.tachiyomi.source.model.Filter
import eu.kanade.tachiyomi.source.model.FilterList
import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
import uy.kohesive.injekt.Injekt
@@ -31,10 +29,6 @@ class MangaLib : LibGroup("MangaLib", "https://mangalib.me", "ru") {
override val baseUrl: String = domain.toString()
override val client: OkHttpClient = super.client.newBuilder()
- .rateLimitHost(baseUrl.toHttpUrl(),10) //source
- .rateLimitHost("https://img2.mixlib.me".toHttpUrl(),1) //secondary
- .rateLimitHost("https://img4.imgslib.link".toHttpUrl(),1) //fourth
- .rateLimitHost("https://img3.cdnlib.link".toHttpUrl(),1) //compress
.addInterceptor(::imageContentTypeIntercept)
.build()
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt
index 9f8af3c40..b0cfd2d57 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt
@@ -9,7 +9,7 @@ class LibGenerator: ThemeSourceGenerator {
override val themeClass = "LibGroup"
- override val baseVersionCode: Int = 6
+ override val baseVersionCode: Int = 7
override val sources = listOf(
SingleLang("MangaLib", "https://mangalib.me", "ru", overrideVersionCode = 74),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
index 0eef69f21..550d366c1 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt
@@ -79,6 +79,7 @@ abstract class LibGroup(
override val client: OkHttpClient = network.cloudflareClient.newBuilder()
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(1, TimeUnit.MINUTES)
+ .rateLimit(3,2)
.addInterceptor { chain ->
val response = chain.proceed(chain.request())
if (response.code == 419)