From 29fe7cd15acf78fdf89311d2f5921f5cdf99a3ec Mon Sep 17 00:00:00 2001 From: happywillow0 <45346080+happywillow0@users.noreply.github.com> Date: Thu, 21 Nov 2019 07:24:21 -0500 Subject: [PATCH] Madara Fixes, - revert AllPornComics, ZinManga fix (#1801) Madara - ZinManga fix --- src/all/madara/build.gradle | 2 +- .../tachiyomi/extension/all/madara/MadaraFactory.kt | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle index 46a713ec8..f11ab9d8d 100644 --- a/src/all/madara/build.gradle +++ b/src/all/madara/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: Madara (multiple sources)' pkgNameSuffix = "all.madara" extClass = '.MadaraFactory' - extVersionCode = 28 + extVersionCode = 29 libVersion = '1.2' } diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt index df0ca4fa5..b87f0324d 100644 --- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt +++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt @@ -8,12 +8,9 @@ import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.Headers -import okhttp3.HttpUrl -import okhttp3.Request -import okhttp3.Response +import okhttp3.* import java.text.SimpleDateFormat -import java.util.Locale +import java.util.* class MadaraFactory : SourceFactory { override fun createSources(): List = listOf( @@ -202,6 +199,8 @@ class ChibiManga : Madara("Chibi Manga", "http://www.cmreader.info/", "en") { } class ZinManga : Madara("Zin Translator", "https://zinmanga.com/", "en") { + override fun headersBuilder(): Headers.Builder = super.headersBuilder() + .add("Referer", "https://zinmanga.com/") override fun searchMangaNextPageSelector() = "nav.navigation-ajax" } @@ -225,8 +224,6 @@ class GetManhwa : Madara("GetManhwa", "https://getmanhwa.co", "en") { override fun searchMangaNextPageSelector() = "nav.navigation-ajax" } class AllPornComic : Madara("AllPornComic", "https://allporncomic.com", "en") { - override fun headersBuilder(): Headers.Builder = Headers.Builder() - .add("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:70.0) Gecko/20100101 Firefox/70.0") override fun searchMangaNextPageSelector() = "a[rel=next]" override fun getGenreList() = listOf( Genre("3D", "3d"),