diff --git a/src/en/hiperdex/build.gradle b/src/en/hiperdex/build.gradle index ce16bc0e3..68c75846f 100644 --- a/src/en/hiperdex/build.gradle +++ b/src/en/hiperdex/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Hiperdex' extClass = '.Hiperdex' themePkg = 'madara' - baseUrl = 'https://hiperdex.top' - overrideVersionCode = 13 + baseUrl = 'https://hiperdex.com' + overrideVersionCode = 14 isNsfw = true } diff --git a/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt b/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt index 716a80ad6..781dd619f 100644 --- a/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt +++ b/src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt @@ -17,7 +17,7 @@ import uy.kohesive.injekt.api.get class Hiperdex : Madara( "Hiperdex", - "https://hiperdex.top", + "https://hiperdex.com", "en", ), ConfigurableSource { diff --git a/src/en/magusmanga/build.gradle b/src/en/magusmanga/build.gradle index ff89fccd1..f54ec168b 100644 --- a/src/en/magusmanga/build.gradle +++ b/src/en/magusmanga/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Magus Manga' extClass = '.MagusManga' themePkg = 'mangathemesia' - baseUrl = 'https://recipeslik.online' - overrideVersionCode = 6 + baseUrl = 'https://oocini.biz' + overrideVersionCode = 7 } apply from: "$rootDir/common.gradle" diff --git a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt index 746683274..173c7fa47 100644 --- a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt +++ b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit class MagusManga : MangaThemesiaAlt( "Magus Manga", - "https://recipeslik.online", + "https://oocini.biz", "en", mangaUrlDirectory = "/series", dateFormat = SimpleDateFormat("MMMMM dd, yyyy", Locale("en")), diff --git a/src/en/mangabtt/build.gradle b/src/en/mangabtt/build.gradle index 8f7233eb9..c10bdb64b 100644 --- a/src/en/mangabtt/build.gradle +++ b/src/en/mangabtt/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'MangaBTT' extClass = '.MangaBTT' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/en/mangabtt/src/eu/kanade/tachiyomi/extension/en/mangabtt/MangaBTT.kt b/src/en/mangabtt/src/eu/kanade/tachiyomi/extension/en/mangabtt/MangaBTT.kt index cf3ec31b1..fed4ab8a3 100644 --- a/src/en/mangabtt/src/eu/kanade/tachiyomi/extension/en/mangabtt/MangaBTT.kt +++ b/src/en/mangabtt/src/eu/kanade/tachiyomi/extension/en/mangabtt/MangaBTT.kt @@ -20,7 +20,7 @@ class MangaBTT : ParsedHttpSource() { override val name = "MangaBTT" - override val baseUrl = "https://mangabtt.com" + override val baseUrl = "https://manhwalampo.com" override val lang = "en" diff --git a/src/en/porncomix/build.gradle b/src/en/porncomix/build.gradle index f2426ce64..608079f57 100644 --- a/src/en/porncomix/build.gradle +++ b/src/en/porncomix/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'PornComix' extClass = '.PornComix' themePkg = 'madara' - baseUrl = 'https://www.porncomixonline.net' - overrideVersionCode = 1 + baseUrl = 'https://porncomix.online' + overrideVersionCode = 2 isNsfw = true } diff --git a/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt b/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt index e82085ee0..7b7194c63 100644 --- a/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt +++ b/src/en/porncomix/src/eu/kanade/tachiyomi/extension/en/porncomix/PornComix.kt @@ -1,5 +1,46 @@ package eu.kanade.tachiyomi.extension.en.porncomix import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.network.POST +import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.MangasPage +import eu.kanade.tachiyomi.source.model.SManga +import kotlinx.serialization.json.jsonArray +import kotlinx.serialization.json.jsonObject +import kotlinx.serialization.json.jsonPrimitive +import okhttp3.FormBody +import okhttp3.Request +import okhttp3.Response -class PornComix : Madara("PornComix", "https://www.porncomixonline.net", "en") +class PornComix : Madara("PornComix", " https://porncomix.online", "en") { + override val mangaSubString = "comic" + override val useNewChapterEndpoint = true + override val chapterUrlSuffix = "" + override val fetchGenres = false + override fun getFilterList() = FilterList() + + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + val form = FormBody.Builder().apply { + add("action", "wp-manga-search-manga") + add("title", query) + }.build() + + return POST("$baseUrl/wp-admin/admin-ajax.php", xhrHeaders, form) + } + + override fun searchMangaParse(response: Response): MangasPage { + val data = json.parseToJsonElement(response.body.string()) + + val entries = data.jsonObject["data"]!!.jsonArray.filter { + it.jsonObject["type"]!!.jsonPrimitive.content == "manga" + }.map { + val obj = it.jsonObject + SManga.create().apply { + title = obj["title"]!!.jsonPrimitive.content + setUrlWithoutDomain(obj["url"]!!.jsonPrimitive.content) + } + } + + return MangasPage(entries, false) + } +} diff --git a/src/es/inmortalscan/build.gradle b/src/es/inmortalscan/build.gradle index ffb1f6a74..3ef86e0b0 100644 --- a/src/es/inmortalscan/build.gradle +++ b/src/es/inmortalscan/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Inmortal Scan' extClass = '.InmortalScan' themePkg = 'madara' - baseUrl = 'https://manga.mundodrama.site' - overrideVersionCode = 0 + baseUrl = 'https://mg.mundodrama.site' + overrideVersionCode = 1 } apply from: "$rootDir/common.gradle" diff --git a/src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt b/src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt index 1631faa01..1d0f38600 100644 --- a/src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt +++ b/src/es/inmortalscan/src/eu/kanade/tachiyomi/extension/es/inmortalscan/InmortalScan.kt @@ -4,4 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class InmortalScan : Madara("Inmortal Scan", "https://manga.mundodrama.site", "es", SimpleDateFormat("MMMM d, yyyy", Locale("es"))) +class InmortalScan : Madara("Inmortal Scan", "https://mg.mundodrama.site", "es", SimpleDateFormat("MMMM d, yyyy", Locale("es"))) diff --git a/src/es/jeazscans/build.gradle b/src/es/jeazscans/build.gradle index 7ff7c54d4..735ea6396 100644 --- a/src/es/jeazscans/build.gradle +++ b/src/es/jeazscans/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Jeaz Scans' extClass = '.JeazScans' themePkg = 'madara' - baseUrl = 'https://jeaz.twobluescans.com' - overrideVersionCode = 3 + baseUrl = 'https://marcialhub.xyz' + overrideVersionCode = 4 isNsfw = false } diff --git a/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt b/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt index 0ac974583..d83a428b4 100644 --- a/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt +++ b/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt @@ -8,7 +8,7 @@ import java.util.Locale class JeazScans : Madara( "JeazScans", - "https://jeaz.twobluescans.com", + "https://marcialhub.xyz", "es", SimpleDateFormat("d MMMM, yyyy", Locale("es")), ) { diff --git a/src/es/nartag/build.gradle b/src/es/nartag/build.gradle index 364974c78..1671c295f 100644 --- a/src/es/nartag/build.gradle +++ b/src/es/nartag/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Traducciones Amistosas' extClass = '.Nartag' - extVersionCode = 2 + extVersionCode = 3 isNsfw = true } diff --git a/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt b/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt index 07a1cd034..d3e7b77e4 100644 --- a/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt +++ b/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt @@ -20,7 +20,7 @@ class Nartag : ParsedHttpSource() { override val name = "Traducciones Amistosas" - override val baseUrl = "https://nartag.com" + override val baseUrl = "https://visortraduccionesamistosas.com" override val lang = "es" diff --git a/src/id/pojokmanga/build.gradle b/src/id/pojokmanga/build.gradle index b5da13506..0cb72a03d 100644 --- a/src/id/pojokmanga/build.gradle +++ b/src/id/pojokmanga/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Pojok Manga' extClass = '.PojokManga' themePkg = 'madara' - baseUrl = 'https://pojokmanga.org' - overrideVersionCode = 6 + baseUrl = 'https://pojokmanga.info' + overrideVersionCode = 7 } apply from: "$rootDir/common.gradle" diff --git a/src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt b/src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt index 68b92bc08..246f09f59 100644 --- a/src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt +++ b/src/id/pojokmanga/src/eu/kanade/tachiyomi/extension/id/pojokmanga/PojokManga.kt @@ -12,7 +12,7 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -class PojokManga : Madara("Pojok Manga", "https://pojokmanga.org", "id", SimpleDateFormat("MMM dd, yyyy", Locale.US)) { +class PojokManga : Madara("Pojok Manga", "https://pojokmanga.info", "id", SimpleDateFormat("MMM dd, yyyy", Locale.US)) { override val client: OkHttpClient = super.client.newBuilder() .rateLimit(10, 2, TimeUnit.SECONDS) diff --git a/src/ja/syosetu/build.gradle b/src/ja/syosetu/build.gradle index 10bd964e7..6d5c3a93d 100644 --- a/src/ja/syosetu/build.gradle +++ b/src/ja/syosetu/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'SyoSetu' extClass = '.SyoSetu' themePkg = 'mangaraw' - baseUrl = 'https://syosetu.top' - overrideVersionCode = 0 + baseUrl = 'https://syosetu.gs' + overrideVersionCode = 1 } apply from: "$rootDir/common.gradle" diff --git a/src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt b/src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt index 5c9620f99..ac55c58a7 100644 --- a/src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt +++ b/src/ja/syosetu/src/eu/kanade/tachiyomi/extension/ja/syosetu/SyoSetu.kt @@ -3,14 +3,23 @@ package eu.kanade.tachiyomi.extension.ja.syosetu import eu.kanade.tachiyomi.multisrc.mangaraw.MangaRawTheme import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList +import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Request import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.jsoup.select.Evaluator -class SyoSetu : MangaRawTheme("SyoSetu", "https://syosetu.top") { +class SyoSetu : MangaRawTheme("SyoSetu", "https://syosetu.gs") { // syosetu.top doesn't have a popular manga page redirect to latest manga request - override fun popularMangaRequest(page: Int): Request = latestUpdatesRequest(page) + override fun popularMangaRequest(page: Int): Request { + val url = baseUrl + if (page > 1) { + "/page/$page/" + } else { + "" + } + + return GET(url, headers) + } override val supportsLatest = false @@ -24,8 +33,15 @@ class SyoSetu : MangaRawTheme("SyoSetu", "https://syosetu.top") { override fun popularMangaSelector() = "article" override fun popularMangaNextPageSelector() = ".next.page-numbers" - override fun searchMangaRequest(page: Int, query: String, filters: FilterList) = - GET("$baseUrl/page/$page?s=$query") + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + val url = baseUrl.toHttpUrl().newBuilder().apply { + if (page > 1) { + addPathSegments("page/$page/") + } + addQueryParameter("s", query) + }.build() + return GET(url, headers) + } override fun Document.getSanitizedDetails(): Element = selectFirst(Evaluator.Tag("article"))!!.selectFirst(Evaluator.Class("content-wrap-inner"))!!.apply { diff --git a/src/th/lamimanga/build.gradle b/src/th/lamimanga/build.gradle index 872848d67..76db81ef4 100644 --- a/src/th/lamimanga/build.gradle +++ b/src/th/lamimanga/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Lami-Manga' extClass = '.LamiManga' themePkg = 'mangathemesia' - baseUrl = 'https://www.lami-manga.com' - overrideVersionCode = 0 + baseUrl = 'https://mangalami.com' + overrideVersionCode = 1 isNsfw = true } diff --git a/src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt b/src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt index c060cad9e..009c19761 100644 --- a/src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt +++ b/src/th/lamimanga/src/eu/kanade/tachiyomi/extension/th/lamimanga/LamiManga.kt @@ -6,7 +6,7 @@ import java.util.Locale class LamiManga : MangaThemesia( "Lami-Manga", - "https://www.lami-manga.com", + "https://mangalami.com", "th", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale("th")), ) diff --git a/src/vi/dualeotruyen/build.gradle b/src/vi/dualeotruyen/build.gradle index 5a744ac6c..86d64e777 100644 --- a/src/vi/dualeotruyen/build.gradle +++ b/src/vi/dualeotruyen/build.gradle @@ -1,7 +1,7 @@ ext { extName = "Dua Leo Truyen" extClass = ".DuaLeoTruyen" - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } diff --git a/src/vi/dualeotruyen/src/eu/kanade/tachiyomi/extension/vi/dualeotruyen/DuaLeoTruyen.kt b/src/vi/dualeotruyen/src/eu/kanade/tachiyomi/extension/vi/dualeotruyen/DuaLeoTruyen.kt index 57bc740d9..983b2edf6 100644 --- a/src/vi/dualeotruyen/src/eu/kanade/tachiyomi/extension/vi/dualeotruyen/DuaLeoTruyen.kt +++ b/src/vi/dualeotruyen/src/eu/kanade/tachiyomi/extension/vi/dualeotruyen/DuaLeoTruyen.kt @@ -22,7 +22,7 @@ class DuaLeoTruyen : ParsedHttpSource() { override val name = "Dưa Leo Truyện" - override val baseUrl = "https://dualeotruyenkk.com" + override val baseUrl = "https://dualeotruyenbi.com" override val lang = "vi" diff --git a/src/vi/hentaivnplus/build.gradle b/src/vi/hentaivnplus/build.gradle index f1a43c307..7744a193c 100644 --- a/src/vi/hentaivnplus/build.gradle +++ b/src/vi/hentaivnplus/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'HentaiVN.plus' extClass = '.HentaiVNPlus' themePkg = 'madara' - baseUrl = 'https://hentaivn.plus' - overrideVersionCode = 0 + baseUrl = 'https://hentaivn.cafe' + overrideVersionCode = 1 isNsfw = true } diff --git a/src/vi/hentaivnplus/src/eu/kanade/tachiyomi/extension/vi/hentaivnplus/HentaiVNPlus.kt b/src/vi/hentaivnplus/src/eu/kanade/tachiyomi/extension/vi/hentaivnplus/HentaiVNPlus.kt index fb38a1f21..f95b103bf 100644 --- a/src/vi/hentaivnplus/src/eu/kanade/tachiyomi/extension/vi/hentaivnplus/HentaiVNPlus.kt +++ b/src/vi/hentaivnplus/src/eu/kanade/tachiyomi/extension/vi/hentaivnplus/HentaiVNPlus.kt @@ -6,7 +6,7 @@ import java.util.Locale class HentaiVNPlus : Madara( "HentaiVN.plus", - "https://hentaivn.plus", + "https://hentaivn.cafe", "vi", dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.ROOT), ) {