diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 31f3252f5..7524e7001 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -43,7 +43,7 @@ jobs: }, { "type": "both", - "regex": ".*(team\\s*x|tqneplus|manga\\s*disk|komiktap|gourmet\\s*scans|manga\\s*crimson|mangawow|voidscans|hikari\\s*scans|mangagegecesi|piedpiperfb|knightnoscanlations|ahstudios|mangagecesi|nartag|xxx\\s*yaoi|yaoi\\s*fan\\s*clube|luminous|dragontea|manhwaid\\.org|hunters\\s*scan|mnhaestate).*", + "regex": ".*(team\\s*x|tqneplus|manga\\s*disk|komiktap|gourmet\\s*scans|manga\\s*crimson|mangawow|voidscans|hikari\\s*scans|mangagegecesi|piedpiperfb|knightnoscanlations|ahstudios|mangagecesi|nartag|xxx\\s*yaoi|yaoi\\s*fan\\s*clube|luminous|dragontea|manhwaid\\.org|hunters\\s*scan|mnhaestate|swatmanga\\.me|reset(?:\\s*|-)scan).*", "ignoreCase": true, "message": "{match} will not be added back as the Scanlator team has requested it to be removed. Read #3475 for more information" } diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/resetscans/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cf6ef500c..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/resetscans/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index f94afba1f..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/resetscans/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 443202f57..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/resetscans/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 23df36249..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/resetscans/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 88d57fb89..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/res/web_hi_res_512.png b/multisrc/overrides/madara/resetscans/res/web_hi_res_512.png deleted file mode 100644 index 52e8bcfaf..000000000 Binary files a/multisrc/overrides/madara/resetscans/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/resetscans/src/ResetScans.kt b/multisrc/overrides/madara/resetscans/src/ResetScans.kt deleted file mode 100644 index 83b03815d..000000000 --- a/multisrc/overrides/madara/resetscans/src/ResetScans.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.resetscans - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.source.model.SChapter -import org.jsoup.nodes.Element -import java.util.Locale - -class ResetScans : Madara("Reset Scans", "https://reset-scans.com", "en", java.text.SimpleDateFormat("dd/MM/yyyy", Locale.US)) { - override val useNewChapterEndpoint = true - - override fun chapterFromElement(element: Element): SChapter { - val chapter = super.chapterFromElement(element) - - with(element) { - chapter.date_upload = select("span.chapter-release-date i").firstOrNull()?.text().let { parseChapterDate(it) } - } - - return chapter - } -} diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 2cd84f335..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index db49ab7c8..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 9ba020142..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 331bdab72..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1b4d2ba43..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/res/web_hi_res_512.png b/multisrc/overrides/mangathemesia/mangaswat/res/web_hi_res_512.png deleted file mode 100644 index 963f86a5e..000000000 Binary files a/multisrc/overrides/mangathemesia/mangaswat/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/mangathemesia/mangaswat/src/MangaSwat.kt b/multisrc/overrides/mangathemesia/mangaswat/src/MangaSwat.kt deleted file mode 100644 index b4d077aac..000000000 --- a/multisrc/overrides/mangathemesia/mangaswat/src/MangaSwat.kt +++ /dev/null @@ -1,57 +0,0 @@ -package eu.kanade.tachiyomi.extension.ar.mangaswat - -import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.Page -import okhttp3.Headers -import okhttp3.Request -import org.json.JSONObject -import org.jsoup.nodes.Document -import java.text.SimpleDateFormat -import java.util.Locale - -class MangaSwat : MangaThemesia( - "MangaSwat", - "https://swatmanga.me", - "ar", - dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US) -) { - - override fun headersBuilder(): Headers.Builder = Headers.Builder() - .add( - "Accept", - "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" - ) - .add("Accept-language", "en-US,en;q=0.9") - .add("Referer", baseUrl) - - override fun imageRequest(page: Page): Request { - val newHeaders = headersBuilder() - .set("Accept", "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8") - .set("Referer", baseUrl) - .build() - return GET(page.imageUrl!!, newHeaders) - } - - override val seriesArtistSelector = "span:contains(الناشر) i" - override val seriesAuthorSelector = "span:contains(المؤلف) i" - override val seriesGenreSelector = "span:contains(التصنيف) a, .mgen a" - override val seriesTypeSelector = "span:contains(النوع) a" - override val seriesStatusSelector = "span:contains(الحالة)" - - override val pageSelector = "div#readerarea img" - - override fun pageListParse(document: Document): List { - var page: List? = null - val scriptContent = document.selectFirst("script:containsData(ts_reader)").data() - val removeHead = scriptContent.replace("ts_reader.run(", "").replace(");", "") - val jsonObject = JSONObject(removeHead) - val sourcesArray = jsonObject.getJSONArray("sources") - val imagesArray = sourcesArray.getJSONObject(0).getJSONArray("images") - page = List(imagesArray.length()) { i -> - Page(i, "", imagesArray[i].toString()) - } - - return page - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 227f7b113..a59db9b79 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -401,7 +401,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Remangas", "https://remangas.net", "pt-BR"), SingleLang("Remoscans", "https://remoscans.xyz", "en"), SingleLang("Renascence Scans (Renascans)", "https://new.renascans.com", "en", className = "RenaScans", overrideVersionCode = 1), - SingleLang("Reset Scans", "https://reset-scans.com", "en", overrideVersionCode = 5), SingleLang("Rh2PlusManga", "https://www.rh2plusmanga.com", "th", overrideVersionCode = 4), SingleLang("Rio2 Manga", "https://rio2manga.com", "en"), SingleLang("Romantik Manga", "https://romantikmanga.com", "tr"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index e36192316..bf2d840a9 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -54,7 +54,6 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Mangasusu", "https://mangasusu.co.in", "id", isNsfw = true, overrideVersionCode = 1), SingleLang("MangaSwat", "https://swatmanga.co", "ar", overrideVersionCode = 7), SingleLang("Mangayaro", "https://mangayaro.net", "id"), - SingleLang("MangaSwat", "https://swatmanga.me", "ar", overrideVersionCode = 8), SingleLang("MangKomik", "https://mangkomik.com", "id"), SingleLang("Mangás Chan", "https://mangaschan.com", "pt-BR", className = "MangasChan"), SingleLang("Manhua Raw", "https://manhuaraw.com", "en"),