From 3406d5bf0436649f01b2398fdca9a9bf359ec99f Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 15 Dec 2021 19:11:40 -0500
Subject: [PATCH] Fix Gson conversion mistake (fixes #10118)
I wonder if it'll only be 1.
---
.../tachiyomi/multisrc/luscious/Luscious.kt | 20 ++++++++++---------
.../multisrc/luscious/LusciousGenerator.kt | 2 +-
.../tachiyomi/multisrc/madara/Madara.kt | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
index 5e802bd29..7724408b3 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt
@@ -128,7 +128,7 @@ abstract class Luscious(
languageIds.toMutableMap().apply {
put(
"value",
- JsonPrimitive ("+$lusLang${languageIds["value"]!!.jsonPrimitive.content}")
+ JsonPrimitive("+$lusLang${languageIds["value"]!!.jsonPrimitive.content}")
)
}
)
@@ -210,7 +210,7 @@ abstract class Luscious(
private fun buildAlbumInfoRequestInput(id: String): JsonObject {
return buildJsonObject {
- put("id", id)
+ put("id", id)
}
}
@@ -268,7 +268,7 @@ abstract class Luscious(
val chapter = SChapter.create()
val url = when (getResolutionPref()) {
"-1" -> it.jsonObject["url_to_original"]!!.jsonPrimitive.content
- else -> it.jsonObject["thumbnails"]!!.jsonObject[getResolutionPref()?.toInt()!!]!!.jsonObject["url"]!!.jsonPrimitive.content
+ else -> it.jsonObject["thumbnails"]!!.jsonArray[getResolutionPref()?.toInt()!!].jsonObject["url"]!!.jsonPrimitive.content
}
when {
url.startsWith("//") -> chapter.url = "https:$url"
@@ -300,10 +300,12 @@ abstract class Luscious(
return buildJsonObject {
putJsonObject("input") {
putJsonArray("filters") {
- add(buildJsonObject {
- put("name", "album_id")
- put("value", id)
- })
+ add(
+ buildJsonObject {
+ put("name", "album_id")
+ put("value", id)
+ }
+ )
}
put("display", getSortPref())
put("page", page)
@@ -338,7 +340,7 @@ abstract class Luscious(
val index = it.jsonObject["position"]!!.jsonPrimitive.int
val url = when (getResolutionPref()) {
"-1" -> it.jsonObject["url_to_original"]!!.jsonPrimitive.content
- else -> it.jsonObject["thumbnails"]!!.jsonObject[getResolutionPref()?.toInt()!!]!!.jsonObject["url"]!!.jsonPrimitive.content
+ else -> it.jsonObject["thumbnails"]!!.jsonArray[getResolutionPref()?.toInt()!!].jsonObject["url"]!!.jsonPrimitive.content
}
when {
url.startsWith("//") -> pages.add(Page(index, "https:$url", "https:$url"))
@@ -387,7 +389,7 @@ abstract class Luscious(
}
when (getResolutionPref()) {
"-1" -> data["items"]!!.jsonArray[page.index % 50].jsonObject["url_to_original"]!!.jsonPrimitive.content
- else -> data["items"]!!.jsonArray[page.index % 50].jsonObject["thumbnails"]!!.jsonObject[getResolutionPref()?.toInt()!!]!!.jsonObject["url"]!!.jsonPrimitive.content
+ else -> data["items"]!!.jsonArray[page.index % 50].jsonObject["thumbnails"]!!.jsonArray[getResolutionPref()?.toInt()!!].jsonObject["url"]!!.jsonPrimitive.content
}
}
}
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt
index 2d2bb76df..9cc5f1ea8 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt
@@ -9,7 +9,7 @@ class LusciousGenerator : ThemeSourceGenerator {
override val themeClass = "Luscious"
- override val baseVersionCode: Int = 13
+ override val baseVersionCode: Int = 14
override val sources = listOf(
MultiLang("Luscious", "https://www.luscious.net", listOf("en", "ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt-BR", "th", "all"), isNsfw = true, className = "LusciousFactory", overrideVersionCode = 2),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
index 0856ea347..db0134d89 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
@@ -511,7 +511,7 @@ abstract class Madara(
// Added "title" alternative
chapter.date_upload = select("img").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) }
?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) }
- ?: parseChapterDate(select("span.chapter-release-date i").firstOrNull()?.text())
+ ?: parseChapterDate(select("span.chapter-release-date i").firstOrNull()?.text())
}
return chapter