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

Merge pull request #137 from ciderapp/main

Browse source 
m
This commit is contained in:
vapormusic 2022-01-16 10:19:09 +07:00 • committed by GitHub
commit 6d7214ff18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/discordrpc.js
View file

@ -71,7 +71,7 @@ module.exports = {
state: `by ${attributes.artistName}`, state: `by ${attributes.artistName}`,
startTimestamp: attributes.startTime, startTimestamp: attributes.startTime,
endTimestamp: attributes.endTime, endTimestamp: attributes.endTime,
largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ? ? 'cider', largeImageKey: (attributes.artwork.url.replace('{w}', '1024').replace('{h}', '1024')) ?? 'cider',
largeImageText: attributes.albumName, largeImageText: attributes.albumName,
smallImageKey: (attributes.status ? 'play' : 'pause'), smallImageKey: (attributes.status ? 'play' : 'pause'),
smallImageText: (attributes.status ? 'Playing' : 'Paused'), smallImageText: (attributes.status ? 'Playing' : 'Paused'),
@ -139,4 +139,4 @@ module.exports = {
} }
}, },
} }

4
src/renderer/index.js
View file

@ -3132,9 +3132,9 @@ const app = new Vue({
element.onclick = app.LastFMAuthenticate; element.onclick = app.LastFMAuthenticate;
}, },
LastFMAuthenticate() { LastFMAuthenticate() {
console.log("wag") console.log("[LastFM] Received LastFM authentication callback")
const element = document.getElementById('lfmConnect'); const element = document.getElementById('lfmConnect');
window.open('https://www.last.fm/api/auth?api_key=174905d201451602407b428a86e8344d&cb=ame://auth/lastfm'); window.open('https://www.last.fm/api/auth?api_key=f9986d12aab5a0fe66193c559435ede3&cb=cider://auth/lastfm');
element.innerText = 'Connecting...'; element.innerText = 'Connecting...';
/* Just a timeout for the button */ /* Just a timeout for the button */