Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

**Bugfixes**
- ([#557](https://github.com/ramsayleung/rspotify/pull/557)) Fix: serialize `Actions` into the same format it is deserialized from, enabling round-trips.
- ([#560](https://github.com/ramsayleung/rspotify/pull/560)) Fix: accept both item(s) and track(s) from playlist(_items) endpoints

## 0.15.3 (2025.11.07)
**Bugfixes**
Expand Down
23 changes: 16 additions & 7 deletions rspotify-model/src/playlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,19 @@ struct SimplifiedPlaylistShadow {
pub owner: PublicUser,
pub public: Option<bool>,
pub snapshot_id: String,
#[serde(alias = "tracks")]
pub items: PlaylistTracksRef,
#[serde(default)]
pub items: Option<PlaylistTracksRef>,
#[serde(default)]
pub tracks: Option<PlaylistTracksRef>,
}

#[allow(deprecated)]
impl From<SimplifiedPlaylistShadow> for SimplifiedPlaylist {
fn from(shadow: SimplifiedPlaylistShadow) -> Self {
let items = shadow
.items
.or(shadow.tracks)
.expect("missing items/tracks");
Self {
collaborative: shadow.collaborative,
external_urls: shadow.external_urls,
Expand All @@ -55,8 +61,8 @@ impl From<SimplifiedPlaylistShadow> for SimplifiedPlaylist {
owner: shadow.owner,
public: shadow.public,
snapshot_id: shadow.snapshot_id,
tracks: shadow.items.clone(),
items: shadow.items,
tracks: items.clone(),
items,
}
}
}
Expand Down Expand Up @@ -169,19 +175,22 @@ struct PlaylistItemShadow {
pub added_at: Option<DateTime<Utc>>,
pub added_by: Option<PublicUser>,
pub is_local: bool,
#[serde(alias = "track")]
#[serde(default)]
pub item: Option<PlayableItem>,
#[serde(default)]
pub track: Option<PlayableItem>,
}

#[allow(deprecated)]
impl From<PlaylistItemShadow> for PlaylistItem {
fn from(shadow: PlaylistItemShadow) -> Self {
let item = shadow.item.or(shadow.track);
Self {
added_at: shadow.added_at,
added_by: shadow.added_by,
is_local: shadow.is_local,
track: shadow.item.clone(),
item: shadow.item,
track: item.clone(),
item,
}
}
}
Expand Down
Loading