From 22cd97563504af2c470f0c1956f8b0d11047400c Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 21 May 2022 14:19:34 +0700
Subject: [PATCH] some fixes

---
 src/renderer/main/vueapp.js                   | 14 ++++++----
 .../views/components/mediaitem-mvview-sp.ejs  | 28 +++++++++++--------
 .../mediaitem-scroller-horizontal-mvview.ejs  |  7 +++--
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index bab8e939..9cace20c 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1678,10 +1678,10 @@ const app = new Vue({
             })
         },
         routeView(item) {
-            let kind = (item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')) : (item.type ?? ''));
-            let id = (item.attributes.playParams ? (item.attributes.playParams.id ?? (item.id ?? '')) : (item.id ?? ''));
-            ;
-            let isLibrary = item.attributes.playParams ? (item.attributes.playParams.isLibrary ?? false) : false;
+            let kind = (item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')) : (item.type ?? ''));
+            let id = (item.attributes?.playParams ? (item.attributes?.playParams?.id ?? (item.id ?? '')) : (item.id ?? ''));
+            console.log(item);
+            let isLibrary = item.attributes?.playParams ? (item.attributes?.playParams?.isLibrary ?? false) : false;
             if (kind.includes("playlist") || kind.includes("album")) {
                 app.showingPlaylist = [];
             }
@@ -1701,8 +1701,10 @@ const app = new Vue({
                     this.routeView(item.relationships.contents.data[0])
                 } else if (item.attributes?.link?.url != null) {
                     if (item.attributes.link.url.includes("viewMultiRoom")) {
-                        
-                        id = item.attributes.link.url.substring(item.attributes.link.url.lastIndexOf("=") + 1)
+                        const params = new Proxy(new URLSearchParams(item.attributes.link.url), {
+                            get: (searchParams, prop) => searchParams.get(prop),
+                          });
+                        id = params.fcId
                         app.getTypeFromID("multiroom", id, false, {
                             platform: "web",
                             extend: "editorialArtwork,uber,lockupStyle"
diff --git a/src/renderer/views/components/mediaitem-mvview-sp.ejs b/src/renderer/views/components/mediaitem-mvview-sp.ejs
index bc4e3efa..aac89b4b 100644
--- a/src/renderer/views/components/mediaitem-mvview-sp.ejs
+++ b/src/renderer/views/components/mediaitem-mvview-sp.ejs
@@ -1,30 +1,30 @@
 <script type="text/x-template" id="mediaitem-mvview-sp">
     <div style="position: relative; display: inline-flex;">
-        <div @click.self='app.routeView(item)'
+        <div @click.self='log(item);app.routeView(item)'
              class="cd-mediaitem-mvview">
             <div style="height: 70px; min-height: 70px; max-height: 70px; width: 100%; margin-left: 5px;">
-                <div class="title-browse-sp bold " @click='app.routeView(item)' style="color: darkgrey;">
-                    {{ badge ? badge.designBadge : ''}}
+                <div class="title-browse-sp bold " @click='log(item);app.routeView(item)' style="color: darkgrey;">
+                    {{ badge ? badge?.designBadge : ''}}
                 </div>
                 <div class="title-browse-sp ">
-                    {{ (badge != null && badge.designTag != null) ? badge.designTag : (item.attributes.name ?? '') }}
+                    {{ (badge != null && badge?.designTag != null) ? badge?.designTag : (item.attributes?.name ?? '') }}
                 </div>
                 <div class="title-browse-sp semibold" style="color: darkgrey;">
-                    {{ (item.attributes.artistName ?? (item.attributes.curatorName ?? '')) }}
+                    {{ (item?.attributes?.artistName ?? (item?.attributes?.curatorName ?? '')) }}
                 </div>
             </div>
             <div class="artwork">
                 <mediaitem-artwork
-                        :url="item.attributes.artwork ? item.attributes.artwork.url : ''"
-                        :video="(item.attributes != null && item.attributes.editorialVideo != null) ? (item.attributes.editorialVideo.motionDetailSquare ? item.attributes.editorialVideo.motionDetailSquare.video : (item.attributes.editorialVideo.motionSquareVideo1x1 ? item.attributes.editorialVideo.motionSquareVideo1x1.video : '')) : '' "
+                        :url="item.attributes?.artwork ? item.attributes?.artwork?.url : ''"
+                        :video="(item.attributes != null && item.attributes?.editorialVideo != null) ? (item.attributes?.editorialVideo?.motionDetailSquare ? item.attributes?.editorialVideo?.motionDetailSquare?.video : (item.attributes?.editorialVideo?.motionSquareVideo1x1 ? item?.attributes?.editorialVideo?.motionSquareVideo1x1?.video : '')) : '' "
                         :size="516" :width="900"
                 ></mediaitem-artwork>
             </div>
-            <div class="cd-mediaitem-mvview-overlay" @click.self='app.routeView(item)'>
+            <div class="cd-mediaitem-mvview-overlay" @click.self='log(item);app.routeView(item)'>
                 <div class="button" style="
                     border-radius: 50%;
                     background: rgba(50,50,50,0.7);"
-                     :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? 
+                     :style="[(!(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ? 
                      {'margin': '205px',
                         'margin-left': '260px', 'margin-bottom': '140px',
                         width: '30px',
@@ -37,11 +37,11 @@
                 </div>
             </div>
         </div>
-        <div class="cd-mediaitem-mvview-overlay" @click.self='app.routeView(item)' tabindex="0">
+        <div class="cd-mediaitem-mvview-overlay" @click.self='log(item);app.routeView(item)' tabindex="0">
             <div class="button" style="
                 border-radius: 50%;
                 background: rgba(50,50,50,0.7);"
-                 :style="[(!(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ?
+                 :style="[(!(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('radioStation') && !(item.attributes?.playParams ? (item.attributes?.playParams?.kind ?? (item.type ?? '')): (item.type ?? '')).includes('song')) ?
                   {'margin': '205px',
                     'margin-left': '260px', 'margin-bottom': '140px',
                     width: '30px',
@@ -65,6 +65,10 @@
                 app: this.$root,
             }
         },
-        methods: {}
+        methods: {
+            log(item) {
+                console.log(item);
+            },
+        }
     });
 </script>
\ No newline at end of file
diff --git a/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
index 1d58039e..0083e3bc 100644
--- a/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
+++ b/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs
@@ -2,9 +2,12 @@
     <vue-horizontal>
         <template v-if="browsesp">
             <mediaitem-mvview-sp
-                    :item="item ? ((item.attributes?.kind != null || item.attributes?.type == 'editorial-elements') ? item : ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) : []"
+                    :item=" 
+                    ((item?.attributes?.kind != null || item?.attributes?.type == 'editorial-elements')
+                     ? item : 
+                     ((item.relationships && item.relationships.contents ) ? item.relationships.contents.data[0] : item)) ?? (item)"
                     :imagesize="imagesize"
-                    :badge="item.attributes" v-for="item in items"></mediaitem-mvview-sp>
+                    :badge="item.attributes ?? [] " v-for="item in items"></mediaitem-mvview-sp>
         </template>
         <template v-else>
             <mediaitem-square :kind="kind" size="600" :key="item?.id ?? ''"