rename ConcurrentHashMap#toList to asList, update playhistory obj

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

@@ -26,11 +26,11 @@ import com.adamratzman.spotify.models.SpotifyAuthenticationException
 import com.adamratzman.spotify.models.Token
 import com.adamratzman.spotify.models.TokenValidityResponse
 import com.adamratzman.spotify.models.serialization.toObject
+import com.adamratzman.spotify.utils.asList
 import com.adamratzman.spotify.utils.runBlocking
-import com.adamratzman.spotify.utils.toList
+import kotlinx.coroutines.Dispatchers
 import kotlin.coroutines.CoroutineContext
 import kotlin.jvm.JvmOverloads
-import kotlinx.coroutines.Dispatchers
 
 internal const val base = "https://api.spotify.com/v1"
 
@@ -98,7 +98,7 @@ sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>(
     /**
      * Obtain a map of all currently-cached requests
      */
-    fun getCache() = endpoints.map { it.cache.cachedRequests.toList() }.flatten().toMap()
+    fun getCache() = endpoints.map { it.cache.cachedRequests.asList() }.flatten().toMap()
 
     /**
      * If the method used to create the [token] supports token refresh and

src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt

@@ -6,7 +6,6 @@ import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
 import com.adamratzman.spotify.utils.runBlocking
-import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -18,6 +17,7 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlin.reflect.KClass
 
 /*
     Types used in PagingObjects and CursorBasedPagingObjects:
@@ -137,7 +137,7 @@ class CursorBasedPagingObject<T : Any>(
     override val limit: Int,
     override val next: String?,
     @SerialName("cursors") val cursor: Cursor,
-    override val total: Int
+    override val total: Int = items.size
 ) : AbstractPagingObject<T>(href, items, limit, next, 0, null, total) {
     /**
      * Get all CursorBasedPagingObjects associated with the request

src/commonMain/kotlin/com.adamratzman.spotify/models/Player.kt

@@ -19,7 +19,13 @@ data class PlayHistoryContext(
     @SerialName("uri") private val uriString: String,
 
     val type: String
-) : CoreObject(href, href, TrackUri(uriString), externalUrlsString) {
+) : CoreObject(
+    href, href, when (type) {
+        "artist" -> ArtistUri(uriString)
+        "playlist" -> PlaylistUri(uriString)
+        else -> AlbumUri(uriString)
+    }, externalUrlsString
+) {
     override val uri: TrackUri get() = super.uri as TrackUri
 }
 
@@ -34,7 +40,7 @@ data class PlayHistoryContext(
 data class PlayHistory(
     val track: SimpleTrack,
     @SerialName("played_at") val playedAt: String,
-    val context: PlayHistoryContext
+    val context: PlayHistoryContext?
 )
 
 /**

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

@@ -11,7 +11,7 @@ expect class ConcurrentHashMap<K, V>() {
     val entries: MutableSet<MutableMap.MutableEntry<K, V>>
 }
 
-expect fun <K, V> ConcurrentHashMap<K, V>.toList(): List<Pair<K, V>>
+expect fun <K, V> ConcurrentHashMap<K, V>.asList(): List<Pair<K, V>>
 
 expect class BufferedImage
 

src/jsMain/kotlin/com/adamratzman/spotify/utils/Types.kt

@@ -7,4 +7,4 @@ actual typealias BufferedImage = File
 
 actual typealias ConcurrentHashMap<K, V> = HashMap<K, V>
 
-actual fun <K, V> ConcurrentHashMap<K, V>.toList(): List<Pair<K, V>> = entries.map { (key, value) -> key to value }
+actual fun <K, V> ConcurrentHashMap<K, V>.asList(): List<Pair<K, V>> = toList()

src/jvmMain/kotlin/com/adamratzman/spotify/utils/Types.kt

@@ -7,4 +7,4 @@ actual typealias BufferedImage = java.awt.image.BufferedImage
 
 actual typealias File = java.io.File
 
-actual fun <K, V> ConcurrentHashMap<K, V>.toList(): List<Pair<K, V>> = entries.map { (key, value) -> key to value }
+actual fun <K, V> ConcurrentHashMap<K, V>.asList(): List<Pair<K, V>> = toList()