From aad33acf0a041116d6aa186d0df19fd72665e1de Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 24 Jul 2022 10:15:50 +0700
Subject: [PATCH] fix for primary-content linking

---
 src/renderer/main/vueapp.js                   |  1 +
 .../views/components/listennow-child.ejs      | 41 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 877789a0..89ddf4f8 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -2919,6 +2919,7 @@ const app = new Vue({
                     "include[albums]": "artists",
                     "include[songs]": "artists",
                     "include[music-videos]": "artists",
+                    "include[personal-recommendation]": "primary-content",
                     "fields[albums]": ["artistName", "artistUrl", "artwork", "contentRating", "editorialArtwork", "editorialVideo", "name", "playParams", "releaseDate", "url"],
                     "fields[artists]": ["name", "url", "artwork"],
                     "extend[stations]": ["airDate", "supportsAirTimeUpdates"],
diff --git a/src/renderer/views/components/listennow-child.ejs b/src/renderer/views/components/listennow-child.ejs
index e6621024..c2321d66 100644
--- a/src/renderer/views/components/listennow-child.ejs
+++ b/src/renderer/views/components/listennow-child.ejs
@@ -2,8 +2,9 @@
     <div v-observe-visibility="{callback: visibilityChanged}">
     <template v-if="isVisible && recom.attributes.display.kind != 'MusicSuperHeroShelf'">    
         <div class="row">
-            <div class="col" @click="navigateContent(recom.attributes.title.contentIds[0] ?? '')" :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0}">
-                <h3>{{ recom.attributes.title ? recom.attributes.title.stringForDisplay : "  "}}</h3>
+            <div class="col">
+                <h3 @click="navigateContent(recom?.relationships['primary-content']?.data[0] ?? recom?.attributes?.title?.contentIds[0] ?? '')" style="width: fit-content;" :class="{'item-navigate' : (recom?.attributes?.title?.contentIds?.length ?? 0) > 0 | recom?.relationships['primary-content']?.data?.length > 0}">
+                    {{ recom.attributes.title ? recom.attributes.title.stringForDisplay : "  "}}</h3>
             </div>
             <div class="col-auto cider-flex-center" v-if="recom.relationships.contents.data.length >= 10">
                         <button class="cd-btn-seeall" @click="showCollection(recom)" >{{app.getLz('term.seeAll')}}</button>
@@ -44,27 +45,37 @@
 	            app.showCollection(recom.relationships.contents, recom.attributes.title ? recom.attributes.title.stringForDisplay : '', 'listen_now')
             },
             navigateContent: async function (id) {
-                try{
-                    let a = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[albums]=${id}`)
-                    let q1 = a.data?.data[0]
-                    if (q1) {
-                        app.routeView(q1)
-                    } else {
+
+                if (typeof id != "string") {
+                    app.routeView(id)
+                } else {
+                    try{
+                        let a = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[albums]=${id}`)
+                        let q1 = a.data?.data[0]
+                        if (q1) {
+                            app.routeView(q1)
+                        } else {
+                            let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
+                            let q2 = b.data?.data[0]
+                            if (q2) {
+                                app.routeView(q2)
+                            } else {
+                                let c = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[playlists]=${id}`)
+                                let q3 = c.data?.data[0]
+                                if (q3) {
+                                    app.routeView(q3)
+                                }
+                            }
+                        } 
+                    } catch (e) {
                         let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
                         let q2 = b.data?.data[0]
                         if (q2) {
                             app.routeView(q2)
                         }
                     }
-                } catch (e) {
-                    let b = await app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}?ids[artists]=${id}`)
-                    let q2 = b.data?.data[0]
-                    if (q2) {
-                        app.routeView(q2)
-                    }
                 }
 
-
             }
         }
     })