From c2555b3e448312d906c3fa6230ed2aac6d209909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferm=C3=ADn=20Cirella?= <fermincirella.ar@gmail.com>
Date: Fri, 12 Jan 2024 14:23:17 -0300
Subject: [PATCH] Anchira - Apply API changes (#191)

* Anchira - Apply API changes

* Anchira - Update version code
---
 src/en/anchira/build.gradle                            |  2 +-
 .../kanade/tachiyomi/extension/en/anchira/Anchira.kt   | 10 +++++-----
 .../tachiyomi/extension/en/anchira/AnchiraDto.kt       | 10 +++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/en/anchira/build.gradle b/src/en/anchira/build.gradle
index f51057a8e..0a4dfaaf0 100644
--- a/src/en/anchira/build.gradle
+++ b/src/en/anchira/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Anchira'
     pkgNameSuffix = 'en.anchira'
     extClass = '.Anchira'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = true
 }
 
diff --git a/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/Anchira.kt b/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/Anchira.kt
index e7fa091b1..3c1c23543 100644
--- a/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/Anchira.kt
+++ b/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/Anchira.kt
@@ -70,7 +70,7 @@ class Anchira : HttpSource(), ConfigurableSource {
                 SManga.create().apply {
                     url = "/g/${it.id}/${it.key}"
                     title = it.title
-                    thumbnail_url = "$cdnUrl/${it.id}/${it.key}/m/${it.cover.name}"
+                    thumbnail_url = "$cdnUrl/${it.id}/${it.key}/m/${it.thumbnailIndex + 1}"
                     artist = it.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
                     author = it.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
                     genre = prepareTags(it.tags)
@@ -160,7 +160,7 @@ class Anchira : HttpSource(), ConfigurableSource {
             url = "/g/${data.id}/${data.key}"
             title = data.title
             thumbnail_url =
-                "$cdnUrl/${data.id}/${data.key}/b/${data.data[data.thumbnailIndex].name}"
+                "$cdnUrl/${data.id}/${data.key}/b/${data.thumbnailIndex + 1}"
             artist = data.tags.filter { it.namespace == 1 }.joinToString(", ") { it.name }
             author = data.tags.filter { it.namespace == 2 }.joinToString(", ") { it.name }
             genre = prepareTags(data.tags)
@@ -205,10 +205,10 @@ class Anchira : HttpSource(), ConfigurableSource {
         val data = decodeBytes<Entry>(response.body, anchiraData.key)
         val imageData = getImageData(data)
 
-        return data.data.mapIndexed { i, img ->
+        return imageData.names.mapIndexed { i, name ->
             Page(
                 i,
-                imageUrl = "$cdnUrl/${data.id}/${imageData.key}/${imageData.hash}/b/${img.name}",
+                imageUrl = "$cdnUrl/${imageData.id}/${imageData.key}/${imageData.hash}/b/$name",
             )
         }
     }
@@ -217,7 +217,7 @@ class Anchira : HttpSource(), ConfigurableSource {
         val keys = anchiraData.galleries.find { it.id == entry.id }
 
         if (keys != null) {
-            return ImageData(keys.id, keys.key, keys.hash)
+            return ImageData(keys.id, keys.key, keys.hash, keys.names)
         }
 
         try {
diff --git a/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/AnchiraDto.kt b/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/AnchiraDto.kt
index 6ee120caa..4260440d2 100644
--- a/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/AnchiraDto.kt
+++ b/src/en/anchira/src/eu/kanade/tachiyomi/extension/en/anchira/AnchiraDto.kt
@@ -8,15 +8,10 @@ data class ListEntry(
     val id: Int,
     val key: String,
     val title: String,
-    val cover: Image,
+    @SerialName("thumb_index") val thumbnailIndex: Int,
     val tags: List<Tag> = emptyList(),
 )
 
-@Serializable
-data class Image(
-    @SerialName("n") val name: String,
-)
-
 @Serializable
 data class Tag(
     var name: String,
@@ -38,7 +33,6 @@ data class Entry(
     @SerialName("published_at") val publishedAt: Long,
     val title: String,
     @SerialName("thumb_index") val thumbnailIndex: Int,
-    val data: List<Image>,
     val tags: List<Tag> = emptyList(),
     val url: String? = null,
 )
@@ -48,6 +42,7 @@ data class ImageData(
     val id: Int,
     val key: String,
     val hash: String,
+    val names: List<String>,
 )
 
 @Serializable
@@ -56,6 +51,7 @@ data class EntryKey(
     val key: String,
     val hash: String,
     val url: String?,
+    val names: List<String> = emptyList(),
 )
 
 @Serializable