use marketName for Market.FROM_TOKEN instead of enum name

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/ArtistApi.kt

@@ -17,6 +17,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 import kotlinx.serialization.builtins.ListSerializer
 
 /**
@@ -123,7 +124,7 @@ public class ArtistApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     public suspend fun getArtistTopTracks(artist: String, market: Market = Market.US): List<Track> = get(
         endpointBuilder("/artists/${ArtistUri(artist).id.encodeUrl()}/top-tracks").with(
             "country",
-            market.name
+            market.getSpotifyId()
         ).toString()
     ).toInnerArray(ListSerializer(Track.serializer()), "tracks", json)
 

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/EpisodeApi.kt

@@ -13,6 +13,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 
 /**
  * Endpoints for retrieving information about one or more episodes from the Spotify catalog.
@@ -38,7 +39,7 @@ public open class EpisodeApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     public suspend fun getEpisode(id: String, market: Market): Episode? {
         return catch {
             get(
-                endpointBuilder("/episodes/${EpisodeUri(id).id.encodeUrl()}").with("market", market.name).toString()
+                endpointBuilder("/episodes/${EpisodeUri(id).id.encodeUrl()}").with("market", market.getSpotifyId()).toString()
             ).toObject(Episode.serializer(), api, json)
         }
     }
@@ -67,7 +68,7 @@ public open class EpisodeApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         return bulkStatelessRequest(50, ids.toList()) { chunk ->
             get(
                 endpointBuilder("/episodes").with("ids", chunk.joinToString(",") { EpisodeUri(it).id.encodeUrl() })
-                    .with("market", market.name).toString()
+                    .with("market", market.getSpotifyId()).toString()
             ).toObject(EpisodeList.serializer(), api, json).episodes
         }.flatten()
     }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/pub/ShowApi.kt

@@ -17,6 +17,7 @@ import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.catch
 import com.adamratzman.spotify.utils.encodeUrl
+import com.adamratzman.spotify.utils.getSpotifyId
 
 /**
  * Endpoints for retrieving information about one or more shows and their episodes from the Spotify catalog.
@@ -42,7 +43,7 @@ public open class ShowApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
     public suspend fun getShow(id: String, market: Market): Show? {
         return catch {
             get(
-                endpointBuilder("/shows/${ShowUri(id).id.encodeUrl()}").with("market", market.name).toString()
+                endpointBuilder("/shows/${ShowUri(id).id.encodeUrl()}").with("market", market.getSpotifyId()).toString()
             ).toObject(Show.serializer(), api, json)
         }
     }
@@ -70,7 +71,7 @@ public open class ShowApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         return bulkStatelessRequest(50, ids.toList()) { chunk ->
             get(
                 endpointBuilder("/shows").with("ids", chunk.joinToString(",") { ShowUri(it).id.encodeUrl() })
-                    .with("market", market.name).toString()
+                    .with("market", market.getSpotifyId()).toString()
             ).toObject(ShowList.serializer(), api, json).shows
         }.flatten()
     }
@@ -99,6 +100,6 @@ public open class ShowApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
         market: Market
     ): PagingObject<SimpleEpisode> = get(
         endpointBuilder("/shows/${ShowUri(id).id.encodeUrl()}/episodes").with("limit", limit)
-            .with("offset", offset).with("market", market.name).toString()
+            .with("offset", offset).with("market", market.getSpotifyId()).toString()
     ).toNonNullablePagingObject(SimpleEpisode.serializer(), null, api, json)
 }

src/commonMain/kotlin/com.adamratzman.spotify/utils/Market.kt

@@ -1829,3 +1829,7 @@ public enum class Market(
         NOT_USED
     }
 }
+
+internal fun Market.getSpotifyId(): String {
+    return if (this == Market.FROM_TOKEN) this.marketName else this.name
+}

src/commonTest/kotlin/com.adamratzman/spotify/pub/PublicArtistsApiTest.kt

@@ -69,5 +69,6 @@ class PublicArtistsApiTest : AbstractTest<GenericSpotifyApi>() {
         assertFailsWith<SpotifyException.BadRequestException> { api.artists.getArtistTopTracks("no") }
         assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW").isNotEmpty())
         assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW", Market.FR).isNotEmpty())
+        assertTrue(api.artists.getArtistTopTracks("4ZGK4hkNX6pilPpyy4YJJW", Market.FROM_TOKEN).isNotEmpty())
     }
 }