From c1a68bf2628a5a4fd186afa39d80435c1d01520e Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Tue, 22 Mar 2022 22:40:47 +0700
Subject: [PATCH] ok

---
 src/renderer/main/vueapp.js                  |  3 ++-
 src/renderer/views/pages/cider-playlist.ejs  | 13 ++++++-------
 src/renderer/views/pages/playlist-inline.ejs | 13 ++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js
index 18b3d606..5c4f485b 100644
--- a/src/renderer/main/vueapp.js
+++ b/src/renderer/main/vueapp.js
@@ -1555,7 +1555,8 @@ const app = new Vue({
                 if (kind.includes("album")) {
                     params["include[albums]"] = "artists"
                     params["fields[artists]"] = "name,url"
-                    params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,copyright"
+                    params["omit[resource]"] = "autos"
+                    params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialNotes,editorialVideo,name,playParams,releaseDate,url,copyright"
                 }
 
                 if (this.cfg.advanced.experiments.includes('inline-playlists')) {
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index c49d03f4..862fc104 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -49,13 +49,12 @@
                                         <artist-chip v-for="artist in data.relationships.artists.data"
                                                      :item="artist"></artist-chip>
                                     </template>
-                                    <div class="playlist-desc"
-                                         v-if="data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)">
-                                        <div v-if="data.attributes.description.short" class="content"
-                                             v-html="data.attributes.description.short"></div>
-                                        <div v-else-if="data.attributes.description.standard" class="content"
-                                             v-html="data.attributes.description.standard"></div>
-                                        <button v-if="data.attributes.description.short" class="more-btn"
+                                    <div class="playlist-desc" v-if="(data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)) || (data.attributes.editorialNotes && (data.attributes.editorialNotes.standard || data.attributes.editorialNotes.short))">
+                                        <div v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short) != null" class="content"
+                                                v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short"></div>
+                                        <div v-else-if="(data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null" class="content"
+                                                v-html="data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard"></div>
+                                        <button v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short ) != null" class="more-btn"
                                                 @click="editorialNotesExpanded = !editorialNotesExpanded">
                                             {{app.getLz('term.showMore')}}
                                         </button>
diff --git a/src/renderer/views/pages/playlist-inline.ejs b/src/renderer/views/pages/playlist-inline.ejs
index a088f31c..95acb33f 100644
--- a/src/renderer/views/pages/playlist-inline.ejs
+++ b/src/renderer/views/pages/playlist-inline.ejs
@@ -57,13 +57,12 @@
                                             <artist-chip v-for="artist in data.relationships.artists.data"
                                                          :item="artist"></artist-chip>
                                         </template>
-                                        <div class="playlist-desc"
-                                             v-if="data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)">
-                                            <div v-if="data.attributes.description.short" class="content"
-                                                 v-html="data.attributes.description.short"></div>
-                                            <div v-else-if="data.attributes.description.standard" class="content"
-                                                 v-html="data.attributes.description.standard"></div>
-                                            <button v-if="data.attributes.description.short" class="more-btn"
+                                        <div class="playlist-desc" v-if="(data.attributes.description && (data.attributes.description.standard || data.attributes.description.short)) || (data.attributes.editorialNotes && (data.attributes.editorialNotes.standard || data.attributes.editorialNotes.short))">
+                                            <div v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short) != null" class="content"
+                                                    v-html="data.attributes.description?.short ?? data.attributes.editorialNotes?.short"></div>
+                                            <div v-else-if="(data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard) != null" class="content"
+                                                    v-html="data.attributes.description?.standard ?? data.attributes.editorialNotes?.standard"></div>
+                                            <button v-if="(data.attributes.description?.short ?? data.attributes.editorialNotes?.short ) != null" class="more-btn"
                                                     @click="editorialNotesExpanded = !editorialNotesExpanded">
                                                 {{app.getLz('term.showMore')}}
                                             </button>