okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix share

Browse source
This commit is contained in:
booploops 2022-07-29 00:43:58 -07:00
parent b28dacf845
commit 5920e82a30
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/renderer/views/components/mediaitem-list-item.ejs
View file

@ -143,7 +143,7 @@
return color return color
}, },
async checkLibrary() { async checkLibrary() {
if ((this.item?.id ?? '').toString().startsWith('ciderlocal')){ if ((this.item?.id ?? '').toString().startsWith('ciderlocal')) {
return true return true
} }
if (this.addedToLibrary) { return this.addedToLibrary } if (this.addedToLibrary) { return this.addedToLibrary }
@ -408,7 +408,7 @@
"icon": "./assets/arrow-bend-up.svg", "icon": "./assets/arrow-bend-up.svg",
"action": function () { "action": function () {
let type = self.item.attributes.playParams?.kind ?? self.item.type let type = self.item.attributes.playParams?.kind ?? self.item.type
if (type == "podcast-episodes") {type = "episode"} if (type == "podcast-episodes") { type = "episode" }
app.mk.playNext({ [type]: self.item.attributes.playParams?.id ?? self.item.id }) app.mk.playNext({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
app.mk.queue._reindex() app.mk.queue._reindex()
app.selectedMediaItems = [] app.selectedMediaItems = []
@ -419,7 +419,7 @@
"icon": "./assets/arrow-bend-down.svg", "icon": "./assets/arrow-bend-down.svg",
"action": function () { "action": function () {
let type = self.item.attributes.playParams?.kind ?? self.item.type let type = self.item.attributes.playParams?.kind ?? self.item.type
if (type == "podcast-episodes") {type = "episode"} if (type == "podcast-episodes") { type = "episode" }
app.mk.playLater({ [type]: self.item.attributes.playParams?.id ?? self.item.id }) app.mk.playLater({ [type]: self.item.attributes.playParams?.id ?? self.item.id })
app.mk.queue._reindex() app.mk.queue._reindex()
app.selectedMediaItems = [] app.selectedMediaItems = []
@ -452,10 +452,16 @@
{ {
"icon": "./assets/feather/share.svg", "icon": "./assets/feather/share.svg",
"name": app.getLz('action.share'), "name": app.getLz('action.share'),
"action": function () { "action": async function () {
if (!self.item.attributes.url && self.item.relationships) { let item = self.item
if (self.item.relationships.catalog) { if (!item.attributes.url) {
app.mkapi(self.item.attributes.playParams?.kind, false, self.item.relationships.catalog.data[0].id).then(u => { self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url) }) if (item.type.includes("library")) {
let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
if(result.attributes.url) {
self.app.copyToClipboard(result.attributes.url)
}else{
notyf.error("Failed to get share URL")
}
} }
} else { } else {
self.app.copyToClipboard(self.item.attributes.url) self.app.copyToClipboard(self.item.attributes.url)
@ -465,10 +471,16 @@
{ {
"icon": "./assets/feather/share.svg", "icon": "./assets/feather/share.svg",
"name": `${app.getLz('action.share')} (song.link)`, "name": `${app.getLz('action.share')} (song.link)`,
"action": function () { "action": async function () {
if (!self.item.attributes.url && self.item.relationships) { let item = self.item
if (self.item.relationships.catalog) { if (!item.attributes.url) {
app.mkapi(self.item.attributes.playParams?.kind, false, self.item.relationships.catalog.data[0].id).then(u => { self.app.songLinkShare((u.data.data.length && u.data.data.length > 0) ? u.data.data[0].attributes.url : u.data.data.attributes.url) }) if (item.type.includes("library")) {
let result = (await app.mk.api.v3.music(`/v1/me/library/${item.type.replace("library-", '')}/${item.id}/catalog`)).data.data[0]
if(result.attributes.url) {
self.app.copyToClipboard(result.attributes.url)
}else{
notyf.error("Failed to get share URL")
}
} }
} else { } else {
self.app.songLinkShare(self.item.attributes.url) self.app.songLinkShare(self.item.attributes.url)
@ -649,4 +661,4 @@
} }
} }
}); });
</script> </script>