diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 74c147a75..98105e6b6 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -53,12 +53,6 @@ jobs: "ignoreCase": true, "message": "Refer to the **Solving Cloudflare issues** section at https://tachiyomi.org/help/guides/troubleshooting/#solving-cloudflare-issues. If it doesn't work, migrate to other sources or wait until they lower their protection." }, - { - "type": "body", - "regex": ".*shinigami\\.id.*", - "ignoreCase": true, - "message": "Duplicate of #15408" - }, { "type": "body", "regex": ".*olympusscans\\.com.*", diff --git a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt b/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt index f4c92f818..8f0707466 100644 --- a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt +++ b/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt @@ -11,7 +11,6 @@ import java.util.Locale class ReaperScansFactory : SourceFactory { override fun createSources() = listOf( ReaperScansTr(), - ReaperScansId(), ReaperScansFr(), ) } @@ -49,12 +48,6 @@ class ReaperScansTr : ReaperScans( override val mangaDetailsSelectorTag = "" } -class ReaperScansId : ReaperScans("https://reaperscans.id", "id") { - - // Tags are useless as they are just SEO keywords. - override val mangaDetailsSelectorTag = "" -} - class ReaperScansFr : ReaperScans( "https://reaperscans.fr", "fr", diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/shinigami/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..bdee42621 Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/shinigami/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..ed4093394 Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/shinigami/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..2e117fba7 Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/shinigami/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..99d44dd47 Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/shinigami/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/shinigami/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..ae54204ec Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/shinigami/res/web_hi_res_512.png b/multisrc/overrides/madara/shinigami/res/web_hi_res_512.png new file mode 100644 index 000000000..5a88d48f8 Binary files /dev/null and b/multisrc/overrides/madara/shinigami/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/shinigami/src/Shinigami.kt b/multisrc/overrides/madara/shinigami/src/Shinigami.kt new file mode 100644 index 000000000..9d31277fe --- /dev/null +++ b/multisrc/overrides/madara/shinigami/src/Shinigami.kt @@ -0,0 +1,30 @@ +package eu.kanade.tachiyomi.extension.id.shinigami + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.source.model.SChapter +import okhttp3.HttpUrl.Companion.toHttpUrl +import org.jsoup.nodes.Element + +class Shinigami : Madara("Shinigami", "https://shinigami.id", "id") { + // moved from Reaper Scans (id) to Shinigami (id) + override val id = 3411809758861089969 + + // Tags are useless as they are just SEO keywords. + override val mangaDetailsSelectorTag = "" + + override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { + val urlElement = element.selectFirst(chapterUrlSelector)!! + + name = urlElement.selectFirst("p.chapter-manhwa-title")?.text() + ?: urlElement.ownText() + date_upload = urlElement.selectFirst("span.chapter-release-date > i")?.text() + .let { parseChapterDate(it) } + + val fixedUrl = urlElement.attr("abs:href").toHttpUrl().newBuilder() + .removeAllQueryParameters("style") + .addQueryParameter("style", "list") + .toString() + + setUrlWithoutDomain(fixedUrl) + } +} 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 d9eb37927..47ed00934 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 @@ -17,7 +17,7 @@ class MadaraGenerator : ThemeSourceGenerator { MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all"), isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1), MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc", overrideVersionCode = 4), MultiLang("Olympus Scanlation", "https://olympusscanlation.com", listOf("es", "pt-BR")), - MultiLang("Reaper Scans", "https://reaperscans.com", listOf("fr", "id", "tr"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 11), + MultiLang("Reaper Scans", "https://reaperscans.com", listOf("fr", "tr"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 12), SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove", overrideVersionCode = 2), SingleLang("1st Kiss Manhua", "https://1stkissmanhua.com", "en", className = "FirstKissManhua", overrideVersionCode = 4), SingleLang("1st Kiss", "https://1stkissmanga.me", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 9), @@ -374,6 +374,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Shayami", "https://shayami.com", "es"), SingleLang("Shield Manga", "https://shieldmanga.io", "en", overrideVersionCode = 3), SingleLang("Shimada Scans", "https://shimadascans.com", "en"), + SingleLang("Shinigami", "https://shinigami.id", "id"), SingleLang("Shirai Scans", "https://shiraiscans.com.br", "pt-BR"), SingleLang("Shooting Star Scans", "https://shootingstarscans.com", "en"), SingleLang("ShoujoHearts", "https://shoujohearts.com", "en", overrideVersionCode = 2),