From 06fc96d53d2cd907cbc626e5317d874a8c226125 Mon Sep 17 00:00:00 2001
From: N0chteil <53608074+N0chteil@users.noreply.github.com>
Date: Sun, 9 Jan 2022 16:31:01 +0100
Subject: [PATCH] Update cider-preload.js

---
 src/preload/cider-preload.js | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index c0246916..4ca3b4cf 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -36,23 +36,29 @@ const MusicKitInterop = {
         const nowPlayingItem = MusicKit.getInstance().nowPlayingItem;
         const isPlayingExport = MusicKit.getInstance().isPlaying;
         const remainingTimeExport = MusicKit.getInstance().currentPlaybackTimeRemaining;
-        const attributes = (nowPlayingItem != null ? nowPlayingItem.attributes : {});
+        const attributes = nowPlayingItem.attributes ?? {};
 
-        attributes.status = isPlayingExport ? isPlayingExport : false;
-        attributes.name = attributes.name ? attributes.name : 'No Title Found';
-        attributes.artwork = attributes.artwork ? attributes.artwork : {url: ''};
-        attributes.artwork.url = attributes.artwork.url ? attributes.artwork.url : '';
-        attributes.playParams = attributes.playParams ? attributes.playParams : {id: 'no-id-found'};
-        attributes.playParams.id = attributes.playParams.id ? attributes.playParams.id : 'no-id-found';
-        attributes.albumName = attributes.albumName ? attributes.albumName : '';
-        attributes.artistName = attributes.artistName ? attributes.artistName : '';
-        attributes.genreNames = attributes.genreNames ? attributes.genreNames : [];
-        attributes.remainingTime = remainingTimeExport ? (remainingTimeExport * 1000) : 0;
-        attributes.durationInMillis = attributes.durationInMillis ? attributes.durationInMillis : 0;
+        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.remainingTime = remainingTimeExport
+            ? remainingTimeExport * 1000
+            : 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.endTime = attributes.endTime ? attributes.endTime : Date.now();
-        return attributes
+        attributes.endTime = Math.round(
+            attributes?.playParams?.id === cache.playParams.id
+                ? Date.now() + attributes?.remainingTime
+                : attributes?.startTime + attributes?.durationInMillis
+        );
+
+        return attributes;
     },
 
     filterTrack: function (a, playbackCheck, mediaCheck) {