From f84b808fb0a80596950c66a7a0f80b4056985bac Mon Sep 17 00:00:00 2001
From: Riztard Lanthorn <riyanluqman@gmail.com>
Date: Fri, 23 Oct 2020 23:29:36 +0700
Subject: [PATCH] Madara Update (#4700)

* add madara source

BestManhua
CutiePie
DiamondFansub
MangaYaku

* handle indonesia timestamp(sec/min/day/hour)

* update ext version

* update ext version

* Revert "update ext version"

This reverts commit 2b541c08bb085927b4da17f01e9a2c3c38463e01.

* add Manga18Fun
---
 src/all/madara/build.gradle                     |  2 +-
 .../tachiyomi/extension/all/madara/Madara.kt    |  8 ++++----
 .../extension/all/madara/MadaraFactory.kt       | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/all/madara/build.gradle b/src/all/madara/build.gradle
index aa7c078f4..39e23a245 100644
--- a/src/all/madara/build.gradle
+++ b/src/all/madara/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Madara (multiple sources)'
     pkgNameSuffix = "all.madara"
     extClass = '.MadaraFactory'
-    extVersionCode = 147
+    extVersionCode = 148
     libVersion = '1.2'
     containsNsfw = true
 }
diff --git a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
index ff60020a4..87383f2de 100644
--- a/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
+++ b/src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
@@ -484,10 +484,10 @@ abstract class Madara(
         val cal = Calendar.getInstance()
 
         return when {
-            WordSet("gün", "jour", "día", "dia", "day").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
-            WordSet("saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
-            WordSet("dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
-            WordSet("segundo", "second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
+            WordSet("hari", "gün", "jour", "día", "dia", "day").anyWordIn(date) -> cal.apply { add(Calendar.DAY_OF_MONTH, -number) }.timeInMillis
+            WordSet("jam", "saat", "heure", "hora", "hour").anyWordIn(date) -> cal.apply { add(Calendar.HOUR, -number) }.timeInMillis
+            WordSet("menit", "dakika", "min", "minute", "minuto").anyWordIn(date) -> cal.apply { add(Calendar.MINUTE, -number) }.timeInMillis
+            WordSet("detik", "segundo", "second").anyWordIn(date) -> cal.apply { add(Calendar.SECOND, -number) }.timeInMillis
             else -> 0
         }
     }
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 4ae78e65c..3be29d910 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
@@ -40,6 +40,7 @@ class MadaraFactory : SourceFactory {
         Azora(),
         Bakaman(),
         BestManga(),
+        BestManhua(),
         BoysLove(),
         CatOnHeadTranslations(),
         CatTranslator(),
@@ -47,9 +48,11 @@ class MadaraFactory : SourceFactory {
         ComicKiba(),
         ComicsValley(),
         CopyPasteScan(),
+        CutiePie(),
         DarkyuRealm(),
         DecadenceScans(),
         DetectiveConanAr(),
+        DiamondFansub(),
         DisasterScans(),
         DoujinHentai(),
         DoujinYosh(),
@@ -78,6 +81,7 @@ class MadaraFactory : SourceFactory {
         KlikManga(),
         KomikGo(),
         LilyManga(),
+        Manga18Fun(),
         Manga347(),
         Manga3asq(),
         Manga68(),
@@ -113,6 +117,7 @@ class MadaraFactory : SourceFactory {
         Mangalek(),
         Mangareceh(),
         Mangasushi(),
+        MangaYaku(),
         MangazukiClubJP(),
         MangazukiClubKO(),
         MangazukiMe(),
@@ -198,6 +203,18 @@ class MadaraFactory : SourceFactory {
     )
 }
 
+class Manga18Fun : Madara("Manga18 Fun", "https://manga18.fun", "en")
+
+class BestManhua : Madara("BestManhua", "https://bestmanhua.com", "en") {
+    override val pageListParseSelector = "li.blocks-gallery-item"
+}
+
+class CutiePie : Madara("Cutie Pie", "https://cutiepie.ga", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.forLanguageTag("tr")))
+
+class DiamondFansub : Madara("DiamondFansub", "https://diamondfansub.com", "tr", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("tr")))
+
+class MangaYaku : Madara("MangaYaku", "https://mangayaku.my.id", "id")
+
 class RuyaManga : Madara("Rüya Manga", "https://www.ruyamanga.com", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.forLanguageTag("tr")))
 
 class HimeraFansub : Madara("Himera Fansub", "https://himera-fansub.com", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.forLanguageTag("tr")))