diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index 267e7fd2..039e717b 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -140,9 +140,10 @@ } }, async getBadges() { - let self = this - if (this.badges[this.item.attributes.playParams.id ?? this.item.id]) { - let friends = this.badges[this.item.attributes.playParams.id ?? this.item.id] + const self = this + const id = (this.item.attributes.playParams ? this.item.attributes.playParams.id : null) || this.item.id + if (id && this.badges[id]) { + let friends = this.badges[id] if (friends) { friends.forEach(function (friend) { self.app.mk.api.v3.music(`/v1/social/${app.mk.storefrontId}/social-profiles/${friend}`).then(data => { diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 26aa8daf..42f6b042 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -40,10 +40,11 @@ @click="data.attributes && data.attributes.artistName ? app.searchAndNavigate(data,'artist') : ''"> {{getArtistName(data)}} -
-
-
@@ -100,7 +101,8 @@
-
+
@@ -182,25 +184,8 @@ this.confirm = true setTimeout(() => this.confirm = false, 3000); }, - - getDescription(data) { - console.log(data.attributes) - if (data.attributes.editorialNotes) { - if (data.attributes.editorialNotes.hasOwnProperty('short')) { - return data.attributes.editorialNotes.short - } else if (data.attributes.editorialNotes.hasOwnProperty('standard')) { - return data.attributes.editorialNotes.standard - } - } else if (data.attributes.description) { - if (data.attributes.description.hasOwnProperty('short')) { - return data.attributes.description.short - } else if (data.attributes.description.hasOwnProperty('standard')) { - return data.attributes.description.standard - } - } - return '' - }, getArtistName(data) { + console.log(data.attributes) if (data.attributes.artistName) { return data.attributes.artistName } else if (data.attributes.artist) { @@ -214,8 +199,12 @@ async isInLibrary() { if (this.data.type && !this.data.type.includes("library")) { // please keep using vars here - var params = { "fields[playlists]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" } - var res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params); + const params = { + "fields[playlists]": "inLibrary", + "fields[albums]": "inLibrary", + "relate": "library" + }; + const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params); this.inLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false console.log(res) } else { @@ -225,7 +214,7 @@ editPlaylist() { this.app.editPlaylist(this.data.id, this.data.attributes.name); this.app.playlists.listing.forEach(playlist => { - if (playlist.id == this.data.id) { + if (playlist.id === this.data.id) { playlist.attributes.name = this.data.attributes.name } }) @@ -237,20 +226,20 @@ this.confirm = false }, async removeFromLibrary(id) { - var params = { "fields[somgs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library" } + const params = {"fields[somgs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library"}; var id = this.data.id ?? this.data.attributes.playParams.id - var res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params); + const res = await app.mkapi(this.data.attributes.playParams.kind ?? this.data.type, this.data.attributes.playParams.isLibrary ?? false, this.data.attributes.playParams.id ?? this.data.id, params); if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) { id = res.relationships.library.data[0].id } let kind = this.data.attributes.playParams.kind ?? this.data.type ?? ''; - var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; - app.mk.api.library.remove({ [truekind]: id }) + const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; + app.mk.api.library.remove({[truekind]: id}) this.inLibrary = false this.confirm = false }, editPlaylistName() { - if (this.data.attributes.canEdit && this.data.type == "library-playlists") { + if (this.data.attributes.canEdit && this.data.type === "library-playlists") { this.nameEditing = true setTimeout(() => { document.querySelector(".nameEdit").focus() @@ -327,7 +316,7 @@ icon: "./assets/feather/share.svg", action: () => { let route = "" - switch(this.data.type) { + switch (this.data.type) { case 'albums': route = `/v1/catalog/${app.mk.storefrontId}/albums/${this.data.id}` break; @@ -341,10 +330,10 @@ route = `/v1/me/library/albums/${this.data.id}/catalog` break } - if(route == '') { + if (route === '') { return } - app.mk.api.v3.music(route).then(res=>{ + app.mk.api.v3.music(route).then(res => { console.log(res.data.data[0].attributes.url) app.copyToClipboard(res.data.data[0].attributes.url) }) @@ -359,28 +348,29 @@ return `${kind}:${id}` }, getFormattedDate: function () { - let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? '') )) + let date = (this.data.attributes.releaseDate ?? (this.data.attributes.lastModifiedDate ?? (this.data.attributes.dateAdded ?? ''))) let prefix = ''; if (date == null || date === "") return ""; - switch(date){ + switch (date) { case this.data.attributes.releaseDate: prefix = 'Released ' break; case this.data.attributes.lastModifiedDate: prefix = 'Updated ' - break; + break; case this.data.attributes.dateAdded: prefix = 'Added ' - break; + break; } + let month, year; try { - var releaseDate = new Date(date); + const releaseDate = new Date(date); console.log(date, releaseDate) - month = new Intl.DateTimeFormat('en-US', { month: 'long' }).format(releaseDate); + month = new Intl.DateTimeFormat('en-US', {month: 'long'}).format(releaseDate); date = releaseDate.getDate(); year = releaseDate.getFullYear(); - return prefix+date + " " + month + " " + year; + return prefix + date + " " + month + " " + year; } catch (e) { return "" } @@ -394,25 +384,27 @@ array[j] = temp; } } - var id = this.data.attributes.playParams.id ?? this.data.id; + + const id = this.data.attributes.playParams.id ?? this.data.id; //console.log("1") - var kind = this.data.attributes.playParams.kind ?? this.data.type ?? ''; + const kind = this.data.attributes.playParams.kind ?? this.data.type ?? ''; //console.log("1") - var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; + const truekind = (!kind.endsWith("s")) ? (kind + "s") : kind; let query = (this.data ?? app.showingPlaylist).relationships.tracks.data.map(item => new MusicKit.MediaItem(item)); app.mk.stop().then(function () { - app.mk.setQueue({[truekind]: [id]}).then(function () { + app.mk.setQueue({[truekind]: [id]}).then(function () { app.mk.play().then(function () { if (query.length > 100) { - let u = query.slice(100); if (app.mk.shuffleMode == 1) { shuffleArray(u) } - app.mk.queue.append(u)} - }) + let u = query.slice(100); + if (app.mk.shuffleMode == 1) { + shuffleArray(u) + } + app.mk.queue.append(u) + } + }) + }) }) - }) - - - } diff --git a/src/renderer/views/svg/pip.svg b/src/renderer/views/svg/pip.svg index 40f5b738..76253ddc 100644 --- a/src/renderer/views/svg/pip.svg +++ b/src/renderer/views/svg/pip.svg @@ -2,12 +2,7 @@ - - - -