Merge remote-tracking branch 'origin/main'

This commit is contained in:
Core 2022-09-13 15:28:56 +01:00
commit 085081afc3
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
3 changed files with 8 additions and 9 deletions

View file

@ -116,9 +116,9 @@
} }
], ],
"build": { "build": {
"electronVersion": "20.1.1", "electronVersion": "20.1.3",
"electronDownload": { "electronDownload": {
"version": "20.1.1+wvcus", "version": "20.1.3+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v" "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
}, },
"appId": "cider", "appId": "cider",

View file

@ -121,7 +121,7 @@ const MusicKitInterop = {
return primaryArtist; return primaryArtist;
case "album": case "album":
return albumData[0] return albumData[0];
} }
}, },

View file

@ -2155,8 +2155,7 @@ const app = new Vue({
} else { } else {
app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? ""); app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? "");
} }
}) });
} else { } else {
app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? ""); app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? "");
} }
@ -4554,7 +4553,7 @@ const app = new Vue({
if (app.mk.nowPlayingItem.relationships.artists.data[0].id) { if (app.mk.nowPlayingItem.relationships.artists.data[0].id) {
app.appRoute(`artist/${app.mk.nowPlayingItem.relationships.artists.data[0].id}`); app.appRoute(`artist/${app.mk.nowPlayingItem.relationships.artists.data[0].id}`);
} else { } else {
const primaryArtist = await MusicKitInterop.fetchSongRelationships({ relationship: "primaryArtist"}) const primaryArtist = await MusicKitInterop.fetchSongRelationships({ relationship: "primaryArtist" });
app.appRoute(`artist/${primaryArtist.id}`); app.appRoute(`artist/${primaryArtist.id}`);
} }
}, },