From 0f2832ef03166073468f622c805c98692be8500a Mon Sep 17 00:00:00 2001
From: Ivan Mariscal <ivan4_x@hotmail.com>
Date: Wed, 4 Oct 2023 20:17:46 -0700
Subject: [PATCH] Fixed GetTop commands from the Tag Api to match Lastfm's
 official response schemas

---
 .../Resources/Tag/GetTopAlbumsSingle.json         |  2 +-
 .../Resources/Tag/GetTopAlbumsSuccess.json        |  2 +-
 .../Api/Commands/Tag/GetTopAlbumsCommand.cs       |  2 +-
 .../Api/Commands/Tag/GetTopTracksCommand.cs       |  2 +-
 src/IF.Lastfm.Core/Objects/LastTag.cs             | 15 +++++++++++++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSingle.json b/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSingle.json
index 7a2e89f5..ee30831d 100644
--- a/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSingle.json
+++ b/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSingle.json
@@ -1,5 +1,5 @@
 {
-  "topalbums": {
+  "albums": {
     "album": {
       "name": "Number Ones",
       "mbid": "12cc16cb-5649-4e1a-bd10-a8a496280990",
diff --git a/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSuccess.json b/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSuccess.json
index 1d7f489a..112aee40 100644
--- a/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSuccess.json
+++ b/src/IF.Lastfm.Core.Tests/Resources/Tag/GetTopAlbumsSuccess.json
@@ -1,5 +1,5 @@
 {
-  "topalbums": {
+  "albums": {
     "album": [
       {
         "name": "Number Ones",
diff --git a/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopAlbumsCommand.cs b/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopAlbumsCommand.cs
index aac843e2..85e1022e 100644
--- a/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopAlbumsCommand.cs
+++ b/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopAlbumsCommand.cs
@@ -33,7 +33,7 @@ public override async Task<PageResponse<LastAlbum>> HandleResponse(HttpResponseM
             if (LastFm.IsResponseValid(json, out status) && response.IsSuccessStatusCode)
             {
                 var jtoken = JsonConvert.DeserializeObject<JToken>(json);
-                var resultsToken = jtoken.SelectToken("topalbums");
+                var resultsToken = jtoken.SelectToken("albums");
                 var itemsToken = resultsToken.SelectToken("album");
 
                 return PageResponse<LastAlbum>.CreateSuccessResponse(itemsToken, resultsToken, LastAlbum.ParseJToken, LastPageResultsType.Attr);
diff --git a/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopTracksCommand.cs b/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopTracksCommand.cs
index 9ca4b664..2e804975 100644
--- a/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopTracksCommand.cs
+++ b/src/IF.Lastfm.Core/Api/Commands/Tag/GetTopTracksCommand.cs
@@ -33,7 +33,7 @@ public override async Task<PageResponse<LastTrack>> HandleResponse(HttpResponseM
             if (LastFm.IsResponseValid(json, out status) && response.IsSuccessStatusCode)
             {
                 var jtoken = JsonConvert.DeserializeObject<JToken>(json);
-                var resultsToken = jtoken.SelectToken("toptracks");
+                var resultsToken = jtoken.SelectToken("tracks");
                 var itemsToken = resultsToken.SelectToken("track");
 
                 return PageResponse<LastTrack>.CreateSuccessResponse(itemsToken, resultsToken, LastTrack.ParseJToken, LastPageResultsType.Attr);
diff --git a/src/IF.Lastfm.Core/Objects/LastTag.cs b/src/IF.Lastfm.Core/Objects/LastTag.cs
index a9ebc233..252309ce 100644
--- a/src/IF.Lastfm.Core/Objects/LastTag.cs
+++ b/src/IF.Lastfm.Core/Objects/LastTag.cs
@@ -35,6 +35,12 @@ public LastTag(string name, string uri, int? count = null)
             Count = count;
         }
 
+        public LastTag(string name, int? count = null)
+        {
+            Name = name;
+            Count = count;
+        }
+
         internal static LastTag ParseJToken(JToken token)
         {
             return ParseJToken(token, null);
@@ -43,7 +49,11 @@ internal static LastTag ParseJToken(JToken token)
         internal static LastTag ParseJToken(JToken token, string relatedTag)
         {
             var name = token.Value<string>("name");
-            var url = token.Value<string>("url");
+
+            Uri uri = null;
+            var urlToken = token.Value<string>("url");
+            if (!String.IsNullOrWhiteSpace(urlToken))
+               uri = new Uri(urlToken, UriKind.RelativeOrAbsolute);
 
             int? count = null;
             var countToken = token.SelectToken("count") ?? token.SelectToken("taggings");
@@ -66,8 +76,9 @@ internal static LastTag ParseJToken(JToken token, string relatedTag)
                 reach = reachToken.ToObject<int?>();
             }
 
-            return new LastTag(name, url, count)
+            return new LastTag(name, count)
             {
+                Url = uri,
                 Streamable = streamable,
                 RelatedTo = relatedTag,
                 Reach = reach