feat: more media in recommendations

app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt

@@ -1045,56 +1045,127 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
     }
     private val onListAnime = (if(PrefManager.getVal(PrefName.IncludeAnimeList)) "" else "onList:false").replace("\"", "")
     private val isAdult = (if (PrefManager.getVal(PrefName.AdultOnly)) "isAdult:true" else "").replace("\"", "")
-    private fun recentAnimeUpdates(): String{
+    private fun recentAnimeUpdates(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}airingSchedules(airingAt_greater:0 airingAt_lesser:${System.currentTimeMillis() / 1000 - 10000} sort:TIME_DESC){episode airingAt media{id idMal status chapters episodes nextAiringEpisode{episode} isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large} title{english romaji userPreferred} mediaListEntry{progress private score(format:POINT_100) status}}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}airingSchedules(airingAt_greater:0 airingAt_lesser:${System.currentTimeMillis() / 1000 - 10000} sort:TIME_DESC){episode airingAt media{id idMal status chapters episodes nextAiringEpisode{episode} isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large} title{english romaji userPreferred} mediaListEntry{progress private score(format:POINT_100) status}}}}"""
     }
-    private fun trendingMovies(): String{
+    private fun trendingMovies(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: ANIME, format: MOVIE, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: ANIME, format: MOVIE, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun topRatedAnime(): String{
+    private fun topRatedAnime(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun mostFavAnime(): String{
+    private fun mostFavAnime(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: ANIME, $onListAnime, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    suspend fun loadAnimeList(): Query.AnimeList?{
+    suspend fun loadAnimeList(): Map<String, ArrayList<Media>>{
-        return executeQuery<Query.AnimeList>(
+        val list = mutableMapOf<String, ArrayList<Media>>()
-            """{
+        fun query(): String {
-                recentUpdates:${recentAnimeUpdates()}
+            return """{
-                trendingMovies:${trendingMovies()}
+                recentUpdates:${recentAnimeUpdates(1)}
-                topRated:${topRatedAnime()}
+                recentUpdates2:${recentAnimeUpdates(2)}
-                mostFav:${mostFavAnime()}
+                trendingMovies:${trendingMovies(1)}
-            }""".trimIndent(), force = true
+                trendingMovies2:${trendingMovies(2)}
-        )
+                topRated:${topRatedAnime(1)}
+                topRated2:${topRatedAnime(2)}
+                mostFav:${mostFavAnime(1)}
+                mostFav2:${mostFavAnime(2)}
+            }""".trimIndent()
+        }
+        executeQuery<Query.AnimeList>(query(), force = true)?.data?.apply {
+            val listOnly: Boolean = PrefManager.getVal(PrefName.RecentlyListOnly)
+            val adultOnly: Boolean = PrefManager.getVal(PrefName.AdultOnly)
+            val idArr = mutableListOf<Int>()
+            list["recentUpdates"] = recentUpdates?.airingSchedules?.mapNotNull { i ->
+                i.media?.let {
+                    if (!idArr.contains(it.id))
+                        if (!listOnly && it.countryOfOrigin == "JP" && Anilist.adult && adultOnly && it.isAdult == true) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else if (!listOnly && !adultOnly && (it.countryOfOrigin == "JP" && it.isAdult == false)) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else if ((listOnly && it.mediaListEntry != null)) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else null
+                    else null
+                }
+            } as ArrayList<Media>
 
+            list["trendingMovies"] = trendingMovies?.media?.map { Media(it) } as ArrayList<Media>
+            list["topRated"] = topRated?.media?.map { Media(it) } as ArrayList<Media>
+            list["mostFav"] = mostFav?.media?.map { Media(it) } as ArrayList<Media>
+
+            list["recentUpdates"]?.addAll(recentUpdates2?.airingSchedules?.mapNotNull { i ->
+                i.media?.let {
+                    if (!idArr.contains(it.id))
+                        if (!listOnly && it.countryOfOrigin == "JP" && Anilist.adult && adultOnly && it.isAdult == true) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else if (!listOnly && !adultOnly && (it.countryOfOrigin == "JP" && it.isAdult == false)) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else if ((listOnly && it.mediaListEntry != null)) {
+                            idArr.add(it.id)
+                            Media(it)
+                        } else null
+                    else null
+                }
+            } as ArrayList<Media>)
+            list["trendingMovies"]?.addAll(trendingMovies2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["topRated"]?.addAll(topRated2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["mostFav"]?.addAll(mostFav2?.media?.map { Media(it) } as ArrayList<Media>)
+        }
+        return list
     }
     private val onListManga = (if(PrefManager.getVal(PrefName.IncludeMangaList)) "" else "onList:false").replace("\"", "")
-    private fun trendingManga(): String{
+    private fun trendingManga(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA,countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA,countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun trendingManhwa(): String{
+    private fun trendingManhwa(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, countryOfOrigin:KR, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, countryOfOrigin:KR, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun trendingNovel(): String{
+    private fun trendingNovel(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, format: NOVEL, countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:POPULARITY_DESC, type: MANGA, format: NOVEL, countryOfOrigin:JP, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun topRatedManga(): String{
+    private fun topRatedManga(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort: SCORE_DESC, type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    private fun mostFavManga(): String{
+    private fun mostFavManga(page: Int): String{
-        return """Page(page:1,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
+        return """Page(page:$page,perPage:50){pageInfo{hasNextPage total}media(sort:FAVOURITES_DESC,type: MANGA, $onListManga, $isAdult){id idMal status chapters episodes nextAiringEpisode{episode}isAdult type meanScore isFavourite format bannerImage countryOfOrigin coverImage{large}title{english romaji userPreferred}mediaListEntry{progress private score(format:POINT_100)status}}}"""
     }
-    suspend fun loadMangaList(): Query.MangaList?{
+    suspend fun loadMangaList(): Map<String, ArrayList<Media>>{
-        return executeQuery<Query.MangaList>(
+        val list = mutableMapOf<String, ArrayList<Media>>()
-            """{
+        fun query(): String{
-                trendingManga:${trendingManga()}
+           return """{
-                trendingManhwa:${trendingManhwa()}
+                trendingManga:${trendingManga(1)}
-                trendingNovel:${trendingNovel()}
+                trendingManga2:${trendingManga(2)}
-                topRated:${topRatedManga()}
+                trendingManhwa:${trendingManhwa(1)}
-                mostFav:${mostFavManga()}
+                trendingManhwa2:${trendingManhwa(2)}
-            }""".trimIndent(), force = true
+                trendingNovel:${trendingNovel(1)}
-        )
+                trendingNovel2:${trendingNovel(2)}
+                topRated:${topRatedManga(1)}
+                topRated2:${topRatedManga(2)}
+                mostFav:${mostFavManga(1)}
+                mostFav2:${mostFavManga(2)}
+            }""".trimIndent()
+        }
 
+        executeQuery<Query.MangaList>(query() , force = true)?.data?.apply {
+            list["trendingManga"] = trendingManga?.media?.map { Media(it) } as ArrayList<Media>
+            list["trendingManhwa"] = trendingManhwa?.media?.map { Media(it) } as ArrayList<Media>
+            list["trendingNovel"] = trendingNovel?.media?.map { Media(it) } as ArrayList<Media>
+            list["topRated"] = topRated?.media?.map { Media(it) } as ArrayList<Media>
+            list["mostFav"] = mostFav?.media?.map { Media(it) } as ArrayList<Media>
+            list["trendingManga"]?.addAll(trendingManga2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["trendingManhwa"]?.addAll(trendingManhwa2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["trendingNovel"]?.addAll(trendingNovel2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["topRated"]?.addAll(topRated2?.media?.map { Media(it) } as ArrayList<Media>)
+            list["mostFav"]?.addAll(mostFav2?.media?.map { Media(it) } as ArrayList<Media>)
+
+        }
+
+        return list
     }
     suspend fun recentlyUpdated(
         greater: Long = 0,

app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt

@@ -5,6 +5,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.webkit.internal.ApiFeature.M
 import androidx.webkit.internal.ApiFeature.P
 import androidx.webkit.internal.StartupApiFeature
 import ani.dantotsu.BuildConfig
@@ -203,32 +204,11 @@ class AnilistAnimeViewModel : ViewModel() {
         MutableLiveData<MutableList<Media>>(null)
     fun getMostFav(): LiveData<MutableList<Media>> = mostFavAnime
     suspend fun loadAll() {
-        val res = Anilist.query.loadAnimeList()?.data
+        val list= Anilist.query.loadAnimeList()
-
+        updated.postValue(list["recentUpdates"])
-        val listOnly: Boolean = PrefManager.getVal(PrefName.RecentlyListOnly)
+        popularMovies.postValue(list["trendingMovies"])
-        val adultOnly: Boolean = PrefManager.getVal(PrefName.AdultOnly)
+        topRatedAnime.postValue(list["topRated"])
-        res?.apply{
+        mostFavAnime.postValue(list["mostFav"])
-            val idArr = mutableListOf<Int>()
-            updated.postValue(recentUpdates?.airingSchedules?.mapNotNull {i ->
-                i.media?.let {
-                    if (!idArr.contains(it.id))
-                        if (!listOnly && it.countryOfOrigin == "JP" && Anilist.adult && adultOnly && it.isAdult == true) {
-                            idArr.add(it.id)
-                            Media(it)
-                        }else if (!listOnly && !adultOnly && (it.countryOfOrigin == "JP" && it.isAdult == false)){
-                            idArr.add(it.id)
-                            Media(it)
-                        }else if ((listOnly && it.mediaListEntry != null)) {
-                            idArr.add(it.id)
-                            Media(it)
-                        }else null
-                    else null
-                }
-            }?.toMutableList() ?: arrayListOf())
-            popularMovies.postValue(trendingMovies?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
-            topRatedAnime.postValue(topRated?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
-            mostFavAnime.postValue(mostFav?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
-        }
     }
 }
 
@@ -321,15 +301,12 @@ class AnilistMangaViewModel : ViewModel() {
         MutableLiveData<MutableList<Media>>(null)
     fun getMostFav(): LiveData<MutableList<Media>> = mostFavManga
     suspend fun loadAll() {
-        val response = Anilist.query.loadMangaList()?.data
+        val list = Anilist.query.loadMangaList()
-
+        popularManga.postValue(list["trendingManga"])
-        response?.apply {
+        popularManhwa.postValue(list["trendingManhwa"])
-            popularManga.postValue(trendingManga?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
+        popularNovel.postValue(list["trendingNovel"])
-            popularManhwa.postValue(trendingManhwa?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
+        topRatedManga.postValue(list["topRated"])
-            popularNovel.postValue(trendingNovel?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
+        mostFavManga.postValue(list["mostFav"])
-            topRatedManga.postValue(topRated?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
-            mostFavManga.postValue(mostFav?.media?.map { Media(it) }?.toMutableList() ?: arrayListOf())
-        }
     }
 }
 

app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt

@@ -157,9 +157,13 @@ class Query {
         @Serializable
         data class Data(
             @SerialName("recentUpdates") val recentUpdates: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("recentUpdates2") val recentUpdates2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("trendingMovies") val trendingMovies: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("trendingMovies2") val trendingMovies2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("topRated") val topRated: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("topRated2") val topRated2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("mostFav") val mostFav: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("mostFav2") val mostFav2: ani.dantotsu.connections.anilist.api.Page?,
         )
     }
     @Serializable
@@ -170,10 +174,15 @@ class Query {
         @Serializable
         data class Data(
             @SerialName("trendingManga") val trendingManga: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("trendingManga2") val trendingManga2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("trendingManhwa") val trendingManhwa: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("trendingManhwa2") val trendingManhwa2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("trendingNovel") val trendingNovel: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("trendingNovel2") val trendingNovel2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("topRated") val topRated: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("topRated2") val topRated2: ani.dantotsu.connections.anilist.api.Page?,
             @SerialName("mostFav") val mostFav: ani.dantotsu.connections.anilist.api.Page?,
+            @SerialName("mostFav2") val mostFav2: ani.dantotsu.connections.anilist.api.Page?,
         )
     }
     @Serializable