Skip to content

Commit b8bf388

Browse files
author
GreenDiscord
committed
updated handling off stuff
1 parent 900aa3e commit b8bf388

File tree

2 files changed

+39
-16
lines changed

2 files changed

+39
-16
lines changed

config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = {
5858
vlc: {
5959

6060
// If no password is given, a random password is used
61-
password: 'passwordgoeshere',
61+
password: 'EEmm23?!',
6262

6363
// This must correspond with the port VLC's web interface uses
6464
port: 8080,

src/rpc/format.js

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ module.exports = async (status) => {
2323
};
2424
} // else
2525
const { meta } = status.information.category;
26-
if(config.rpc.changeButtonProvider === "youtube"){
27-
var enableYoutubeButton = "true"
28-
}
26+
2927

3028

3129
const fetchArtworkApple = async (searchQuery) => {
@@ -68,9 +66,18 @@ module.exports = async (status) => {
6866
var fetched = "Nowhere";
6967
}
7068

69+
if(config.rpc.changeButtonProvider === "youtube"){
70+
var enableYoutubeButton = "true"
71+
}
72+
7173
if (meta.artist === undefined){
7274
var artwork = config.rpc.largeIcon
7375
var fetched = "Nowhere"
76+
var enableYoutubeButton = "true"
77+
} else if (meta.title === undefined) {
78+
var artwork = config.rpc.largeIcon
79+
var fetched = "Nowhere"
80+
var enableYoutubeButton = "true"
7481
}
7582

7683
if (config.rpc.largeImageText === "artist"){
@@ -87,10 +94,31 @@ module.exports = async (status) => {
8794

8895

8996
if(enableYoutubeButton){
90-
const search = await yt(`${meta.title} ${meta.artist}`, { limit: 1 })
91-
const resultunjson = JSON.stringify(search.items)
92-
var result = JSON.parse(resultunjson)
93-
}
97+
if (meta.title === undefined) {
98+
const search = await yt(`${meta.filename}`, { limit: 1 })
99+
const resultunjson = JSON.stringify(search.items)
100+
const result = JSON.parse(resultunjson)
101+
var url = result[0].url
102+
var label = "Listen on Youtube"
103+
} else if (meta.artist === undefined) {
104+
const search = await yt(`${meta.filename}`, { limit: 1 })
105+
const resultunjson = JSON.stringify(search.items)
106+
const result = JSON.parse(resultunjson)
107+
var url = result[0].url
108+
var label = "Listen on Youtube"
109+
} else {
110+
const search = await yt(`${meta.title} ${meta.artist}`, { limit: 1 })
111+
const resultunjson = JSON.stringify(search.items)
112+
const result = JSON.parse(resultunjson)
113+
var url = result[0].url
114+
var label = "Listen on Youtube"
115+
}
116+
117+
118+
} else {
119+
var url = appleresponse.data.results[0].trackViewUrl
120+
var label = "Listen on Apple Music"
121+
}
94122

95123

96124

@@ -104,14 +132,9 @@ module.exports = async (status) => {
104132
smallImageText: `Volume: ${Math.round(status.volume / 2.56)}%`,
105133
instance: true,
106134
buttons: [
107-
enableYoutubeButton
108-
? {
109-
label: "Listen on Youtube",
110-
url: result[0].url,
111-
}
112-
: {
113-
label: "Listen on Apple Music",
114-
url: appleresponse.data.results[0].trackViewUrl,
135+
{
136+
label: label,
137+
url: url,
115138
},
116139
]
117140
};

0 commit comments

Comments
 (0)