diff --git a/src-tauri/src/api/models.rs b/src-tauri/src/api/models.rs index 4f140ec6c..577b6482f 100644 --- a/src-tauri/src/api/models.rs +++ b/src-tauri/src/api/models.rs @@ -410,7 +410,7 @@ pub struct PurchaseAlbum { pub downloadable: bool, #[serde(default)] pub downloaded: bool, - pub purchased_at: Option, + pub purchased_at: Option, #[serde(default)] pub tracks: Option>, } @@ -433,7 +433,7 @@ pub struct PurchaseTrack { pub streamable: bool, #[serde(default)] pub downloaded: bool, - pub purchased_at: Option, + pub purchased_at: Option, } /// Favorites container diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index 19c676888..bef465a2d 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -8101,7 +8101,7 @@ pub async fn v2_purchases_get_album( maximum_bit_depth: track.maximum_bit_depth, streamable: track.streamable, downloaded: false, - purchased_at: purchase_meta.and_then(|item| item.purchased_at.clone()), + purchased_at: purchase_meta.and_then(|item| item.purchased_at), }) .collect() }) @@ -8122,7 +8122,7 @@ pub async fn v2_purchases_get_album( maximum_bit_depth: album.maximum_bit_depth, downloadable: purchase_meta.map(|item| item.downloadable).unwrap_or(true), downloaded: false, - purchased_at: purchase_meta.and_then(|item| item.purchased_at.clone()), + purchased_at: purchase_meta.and_then(|item| item.purchased_at), tracks: Some(ApiSearchResultsPage { offset: 0, limit: tracks_items.len() as u32, diff --git a/src/lib/components/views/PurchaseAlbumDetailView.svelte b/src/lib/components/views/PurchaseAlbumDetailView.svelte index 0c5c92e44..c0f8a0614 100644 --- a/src/lib/components/views/PurchaseAlbumDetailView.svelte +++ b/src/lib/components/views/PurchaseAlbumDetailView.svelte @@ -29,10 +29,10 @@ let isDownloadingAll = $state(false); let allComplete = $state(false); - function formatPurchaseDate(iso?: string): string { - if (!iso) return ''; + function formatPurchaseDate(ts?: number): string { + if (!ts) return ''; try { - return new Date(iso).toLocaleDateString(undefined, { + return new Date(ts * 1000).toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric', diff --git a/src/lib/components/views/PurchasesView.svelte b/src/lib/components/views/PurchasesView.svelte index baa826d48..1def20602 100644 --- a/src/lib/components/views/PurchasesView.svelte +++ b/src/lib/components/views/PurchasesView.svelte @@ -121,10 +121,10 @@ showAlbumSortMenu = false; } - function formatPurchaseDate(iso?: string): string { - if (!iso) return ''; + function formatPurchaseDate(ts?: number): string { + if (!ts) return ''; try { - return new Date(iso).toLocaleDateString(undefined, { + return new Date(ts * 1000).toLocaleDateString(undefined, { year: 'numeric', month: 'short', day: 'numeric', @@ -170,7 +170,7 @@ switch (albumSortBy) { case 'date': return sorted.sort((a, b) => - dir * (new Date(a.purchased_at || '').getTime() - new Date(b.purchased_at || '').getTime()) + dir * ((a.purchased_at || 0) - (b.purchased_at || 0)) ); case 'artist': return sorted.sort((a, b) => dir * a.artist.name.localeCompare(b.artist.name)); diff --git a/src/lib/types/purchases.ts b/src/lib/types/purchases.ts index e77fa3abd..df6bd8816 100644 --- a/src/lib/types/purchases.ts +++ b/src/lib/types/purchases.ts @@ -25,7 +25,7 @@ export interface PurchasedAlbum { maximum_sampling_rate?: number; downloadable: boolean; downloaded?: boolean; - purchased_at?: string; + purchased_at?: number; tracks?: PaginatedList; } @@ -46,7 +46,7 @@ export interface PurchasedTrack { maximum_sampling_rate?: number; streamable: boolean; downloaded?: boolean; - purchased_at?: string; + purchased_at?: number; } export interface PurchaseDownloadProgress {