From 01fc9707a70779e67f08965f2143fcdd216d3a91 Mon Sep 17 00:00:00 2001
From: vaginadesolator <76472350+vaginadesolator@users.noreply.github.com>
Date: Thu, 14 Jan 2021 04:41:41 +0800
Subject: [PATCH] Various Doujins ext fixes (#5402)

* Parse tags when reading manga page

* Fix date not parsed for mangas with requesters

* Fix latest page queries using incorrect timezone
---
 src/en/doujins/build.gradle                            |  2 +-
 .../kanade/tachiyomi/extension/en/doujins/Doujins.kt   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/en/doujins/build.gradle b/src/en/doujins/build.gradle
index 0647229d2..44808c24e 100644
--- a/src/en/doujins/build.gradle
+++ b/src/en/doujins/build.gradle
@@ -5,7 +5,7 @@ ext {
     extName = 'Doujins'
     pkgNameSuffix = 'en.doujins'
     extClass = '.Doujins'
-    extVersionCode = 1
+    extVersionCode = 2
     libVersion = '1.2'
     containsNsfw = true
 }
diff --git a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
index b3e1a444e..85edacaac 100644
--- a/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
+++ b/src/en/doujins/src/eu/kanade/tachiyomi/extension/en/doujins/Doujins.kt
@@ -26,6 +26,7 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
+import java.util.TimeZone
 
 @Nsfw
 class Doujins : HttpSource() {
@@ -50,7 +51,9 @@ class Doujins : HttpSource() {
                 name = "Chapter"
                 setUrlWithoutDomain(response.request().url().toString())
 
-                val date = response.asJsoup().select(".folder-message").last().text().substringBefore(" • ")
+                val dateAndPageCountString = response.asJsoup().select(".text-md-right.text-sm-left > .folder-message").text()
+
+                val date = dateAndPageCountString.substringBefore(" • ")
                 for (dateFormat in MANGA_DETAILS_DATE_FORMAT) {
                     if (date_upload == 0L)
                         date_upload = dateFormat.parseOrNull(date)?.time ?: 0L
@@ -80,7 +83,7 @@ class Doujins : HttpSource() {
     }
 
     private fun getLatestPageUrl(page: Int): String {
-        val endDate = Calendar.getInstance().apply {
+        val endDate = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply {
             add(Calendar.DATE, 1)
             set(Calendar.HOUR_OF_DAY, 0)
             set(Calendar.MINUTE, 0)
@@ -103,8 +106,9 @@ class Doujins : HttpSource() {
         val document = response.asJsoup()
         return SManga.create().apply {
             title = document.select(".folder-title a").last().text()
-            artist = document.select(".gallery-artist a").joinToString(", ") { it.text() }
+            artist = document.select(".gallery-artist a").joinToString { it.text() }
             author = artist
+            genre = document.select(".tag-area").first().select("a").joinToString { it.text() }
         }
     }