From 8cd650b07e5f4c4c2f296bf4374e5ee67fb3eb50 Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Mon, 22 Jan 2024 17:51:12 +0600
Subject: [PATCH] fix: artist page error #1018

---
 .../spotify_endpoints.dart                    | 56 +++++++++++++++++++
 lib/services/queries/artist.dart              |  7 ++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/lib/services/custom_spotify_endpoints/spotify_endpoints.dart b/lib/services/custom_spotify_endpoints/spotify_endpoints.dart
index 4a55130a1..0510e69a9 100644
--- a/lib/services/custom_spotify_endpoints/spotify_endpoints.dart
+++ b/lib/services/custom_spotify_endpoints/spotify_endpoints.dart
@@ -162,4 +162,60 @@ class CustomSpotifyEndpoints {
       result["tracks"].map((track) => Track.fromJson(track)).toList(),
     );
   }
+
+  Future<Artist> artist({required String id}) async {
+    final pathQuery = "$_baseUrl/artists/$id";
+
+    final res = await _client.get(
+      Uri.parse(pathQuery),
+      headers: {
+        "content-type": "application/json",
+        if (accessToken.isNotEmpty) "authorization": "Bearer $accessToken",
+        "accept": "application/json",
+      },
+    );
+
+    final data = jsonDecode(res.body);
+
+    return Artist.fromJson(_purifyArtistResponse(data));
+  }
+
+  Future<List<Artist>> relatedArtists({required String id}) async {
+    final pathQuery = "$_baseUrl/artists/$id/related-artists";
+
+    final res = await _client.get(
+      Uri.parse(pathQuery),
+      headers: {
+        "content-type": "application/json",
+        if (accessToken.isNotEmpty) "authorization": "Bearer $accessToken",
+        "accept": "application/json",
+      },
+    );
+
+    final data = jsonDecode(res.body);
+
+    return List.castFrom<dynamic, Artist>(
+      data["artists"]
+          .map((artist) => Artist.fromJson(_purifyArtistResponse(artist)))
+          .toList(),
+    );
+  }
+
+  Map<String, dynamic> _purifyArtistResponse(Map<String, dynamic> data) {
+    if (data["popularity"] != null) {
+      data["popularity"] = data["popularity"].toInt();
+    }
+    if (data["followers"]?["total"] != null) {
+      data["followers"]["total"] = data["followers"]["total"].toInt();
+    }
+    if (data["images"] != null) {
+      data["images"] = data["images"].map((e) {
+        e["height"] = e["height"].toInt();
+        e["width"] = e["width"].toInt();
+        return e;
+      }).toList();
+    }
+
+    return data;
+  }
 }
diff --git a/lib/services/queries/artist.dart b/lib/services/queries/artist.dart
index 1b939c823..5ccc4955e 100644
--- a/lib/services/queries/artist.dart
+++ b/lib/services/queries/artist.dart
@@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/hooks/spotify/use_spotify_infinite_query.dart';
 import 'package:spotube/hooks/spotify/use_spotify_query.dart';
+import 'package:spotube/provider/custom_spotify_endpoint_provider.dart';
 import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
 import 'package:spotube/services/wikipedia/wikipedia.dart';
 import 'package:wikipedia_api/wikipedia_api.dart';
@@ -15,9 +16,10 @@ class ArtistQueries {
     WidgetRef ref,
     String artist,
   ) {
+    final customSpotify = ref.watch(customSpotifyEndpointProvider);
     return useSpotifyQuery<Artist, dynamic>(
       "artist-profile/$artist",
-      (spotify) => spotify.artists.get(artist),
+      (spotify) => customSpotify.artist(id: artist),
       ref: ref,
     );
   }
@@ -125,10 +127,11 @@ class ArtistQueries {
     WidgetRef ref,
     String artist,
   ) {
+    final customSpotify = ref.watch(customSpotifyEndpointProvider);
     return useSpotifyQuery<Iterable<Artist>, dynamic>(
       "artist-related-artist-query/$artist",
       (spotify) {
-        return spotify.artists.relatedArtists(artist);
+        return customSpotify.relatedArtists(id: artist);
       },
       ref: ref,
     );