From 585b4c1968a150e416fe623339d3cf8389346fd9 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Sun, 19 Sep 2021 21:47:35 +0430
Subject: [PATCH] Tachidesk: sync implementation with >= v0.5.0 (#9132)

---
 src/all/tachidesk/build.gradle                 |  2 +-
 .../tachiyomi/extension/all/tachidesk/Dto.kt   | 18 +++++++++++++++---
 .../extension/all/tachidesk/Tachidesk.kt       |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/all/tachidesk/build.gradle b/src/all/tachidesk/build.gradle
index f2aa46560..157c725bc 100644
--- a/src/all/tachidesk/build.gradle
+++ b/src/all/tachidesk/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Tachidesk'
     pkgNameSuffix = 'all.tachidesk'
     extClass = '.Tachidesk'
-    extVersionCode = 2
+    extVersionCode = 3
     containsNsfw = true
 }
 
diff --git a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Dto.kt b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Dto.kt
index 5ca86c9c7..464496969 100644
--- a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Dto.kt
+++ b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Dto.kt
@@ -8,8 +8,18 @@ data class SourceDataClass(
     val name: String?,
     val lang: String?,
     val iconUrl: String?,
+
+    /** The Source provides a latest listing */
     val supportsLatest: Boolean?,
-    val isConfigurable: Boolean?
+
+    /** The Source implements [ConfigurableSource] */
+    val isConfigurable: Boolean?,
+
+    /** The Source class has a @Nsfw annotation */
+    val isNsfw: Boolean?,
+
+    /** A nicer version of [name] */
+    val displayName: String?,
 )
 
 @Serializable
@@ -26,13 +36,15 @@ data class MangaDataClass(
     val artist: String? = null,
     val author: String? = null,
     val description: String? = null,
-    val genre: String? = null,
+    val genre: List<String> = emptyList(),
     val status: String = "UNKNOWN",
     val inLibrary: Boolean = false,
     val source: SourceDataClass? = null,
     val meta: Map<String, String> = emptyMap(),
 
-    val freshData: Boolean = false
+    val realUrl: String? = null,
+
+    val freshData: Boolean = false,
 )
 
 @Serializable
diff --git a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
index 30a9af5a7..b3845fdde 100644
--- a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
+++ b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
@@ -217,12 +217,13 @@ class Tachidesk : ConfigurableSource, HttpSource() {
     // ------------- Util -------------
 
     private fun MangaDataClass.toSManga() = SManga.create().also {
-        it.title = title
         it.url = id.toString()
+        it.title = title
         it.thumbnail_url = "$baseUrl$thumbnailUrl"
         it.artist = artist
         it.author = author
         it.description = description
+        it.genre = genre.joinToString(", ")
         it.status = when (status) {
             "ONGOING" -> SManga.ONGOING
             "COMPLETED" -> SManga.COMPLETED