diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 0a592f20..403558b4 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -73,25 +73,25 @@ const MusicKitInterop = { const attributes = nowPlayingItem.attributes ?? {}; attributes.status = isPlayingExport ?? false; - attributes.name = attributes.name ?? 'No Title Found'; - attributes.artwork = attributes.artwork ?? { url: '' }; - attributes.artwork.url = attributes.artwork.url ?? ''; - attributes.playParams = attributes.playParams ?? { id: 'no-id-found' }; - attributes.playParams.id = attributes.playParams.id ?? 'no-id-found'; - attributes.albumName = attributes.albumName ?? ''; - attributes.artistName = attributes.artistName ?? ''; - attributes.genreNames = attributes.genreNames ?? []; + attributes.name = attributes?.name ?? 'No Title Found'; + attributes.artwork = attributes?.artwork ?? { url: '' }; + attributes.artwork.url = attributes?.artwork?.url ?? ''; + attributes.playParams = attributes?.playParams ?? { id: 'no-id-found' }; + attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found'; + attributes.albumName = attributes?.albumName ?? ''; + attributes.artistName = attributes?.artistName ?? ''; + attributes.genreNames = attributes?.genreNames ?? []; attributes.remainingTime = remainingTimeExport ? remainingTimeExport * 1000 : 0; - attributes.durationInMillis = attributes.durationInMillis ?? 0; + attributes.durationInMillis = attributes?.durationInMillis ?? 0; attributes.startTime = Date.now(); attributes.endTime = Math.round( - attributes.playParams.id === cache.playParams.id - ? Date.now() + attributes.remainingTime - : attributes.startTime + attributes.durationInMillis + attributes?.playParams?.id === cache.playParams.id + ? Date.now() + attributes?.remainingTime + : attributes?.startTime + attributes?.durationInMillis ); - attributes.endTime = attributes.endTime ?? Date.now(); + attributes.endTime = attributes?.endTime ?? Date.now(); return attributes; },