From 6f0ba4888669f414a2093d7632eb1fab109d74de Mon Sep 17 00:00:00 2001 From: curche <72807749+curche@users.noreply.github.com> Date: Wed, 18 Aug 2021 11:26:06 +0530 Subject: [PATCH] use format instead of type in anilist search As per anilist graphql docs, `type` refers to whether anime/manga and is redundant (since we already limit it to `MANGA`). What we actually want is `format` which includes whether the media is a One-shot or Manga This should help in making search a bit better as one no longer needs to rely on the Date to figure out if its the One-shot entry or the Manga entry --- .../java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt | 4 ++-- .../eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt index 758423b155..583dd8778f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt @@ -180,7 +180,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { |coverImage { |large |} - |type + |format |status |chapters |description @@ -267,7 +267,7 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { struct["title"]!!.jsonObject["romaji"]!!.jsonPrimitive.content, struct["coverImage"]!!.jsonObject["large"]!!.jsonPrimitive.content, struct["description"]!!.jsonPrimitive.contentOrNull, - struct["type"]!!.jsonPrimitive.content, + struct["format"]!!.jsonPrimitive.content.replace("_", "-"), struct["status"]!!.jsonPrimitive.contentOrNull ?: "", parseDate(struct, "startDate"), struct["chapters"]!!.jsonPrimitive.intOrNull ?: 0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt index 0b3a9c6f33..920dbc2293 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistModels.kt @@ -13,7 +13,7 @@ data class ALManga( val title_romaji: String, val image_url_lge: String, val description: String?, - val type: String, + val format: String, val publishing_status: String, val start_date_fuzzy: Long, val total_chapters: Int @@ -27,7 +27,7 @@ data class ALManga( summary = description ?: "" tracking_url = AnilistApi.mangaUrl(media_id) publishing_status = this@ALManga.publishing_status - publishing_type = type + publishing_type = format if (start_date_fuzzy != 0L) { start_date = try { val outputDf = SimpleDateFormat("yyyy-MM-dd", Locale.US)