its still fucked but etyd.cc will work now
This commit is contained in:
@@ -7,7 +7,9 @@ import { globalConfig } from "../index.js"
|
||||
* @returns True for successful authentication and authorization, false if either fail
|
||||
*/
|
||||
async function checkToken(token,scope) {
|
||||
return await fetch(`${globalConfig.couchdbHost}/auth/sessions`).then(fetchRes => {
|
||||
return await fetch(`${process.env.API_DBHOST}/auth/sessions`, {
|
||||
headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
|
||||
}).then(fetchRes => {
|
||||
|
||||
return fetchRes.json().then(dbRes => {
|
||||
|
||||
|
||||
@@ -1,16 +1,23 @@
|
||||
import { globalConfig } from "../index.js"
|
||||
|
||||
const notPlayingAnythingPlaceholder = {
|
||||
"json": {
|
||||
"playing": false
|
||||
},
|
||||
"html": `<span>I'm not currently listening to anything.</span>`
|
||||
}
|
||||
|
||||
/**
|
||||
* Queries LastFM for user set in config file and returns formatted result
|
||||
* @returns {object} Object containing response in JSON and HTML (as string), WILL RETURN EMPTY OBJECT ON FAILURE!
|
||||
* @returns {object} Object containing response in JSON and HTML (as string)
|
||||
*/
|
||||
async function queryLastfm() {
|
||||
return await fetch(`https://ws.audioscrobbler.com/2.0/?format=json&method=user.getrecenttracks&limit=1&api_key=${globalConfig.nowplaying.lastfm.apiKey}&user=${globalConfig.nowplaying.lastfm.target}`).then(response => response.json()).then(response => {
|
||||
if (response["recenttracks"] == undefined) {
|
||||
return {}
|
||||
return notPlayingAnythingPlaceholder
|
||||
} else {
|
||||
if (response.recenttracks.track[0]["@attr"] == undefined) {
|
||||
return {}
|
||||
return notPlayingAnythingPlaceholder
|
||||
} else {
|
||||
return {
|
||||
"json": {
|
||||
@@ -30,17 +37,29 @@ async function queryLastfm() {
|
||||
})
|
||||
}
|
||||
|
||||
// async function queryJellyfin() {
|
||||
// return await fetch(`${globalConfig.nowplaying.jellyfin.host}/Sessions`, {
|
||||
// headers: {
|
||||
// "Authorization": `MediaBrowser Token=${globalConfig.nowplaying.jellyfin.apiKey}`
|
||||
// }
|
||||
// }).then(response => response.json()).then(response => {
|
||||
// for (x in response) {
|
||||
// if (response[x].UserName !== globalConfig.nowplaying.jellyfin.target) { break }
|
||||
// if (response[x].)
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
async function queryJellyfin() {
|
||||
return await fetch(`${globalConfig.nowplaying.jellyfin.host}/Sessions`, {
|
||||
headers: {
|
||||
"Authorization": `MediaBrowser Token=${globalConfig.nowplaying.jellyfin.apiKey}`
|
||||
}
|
||||
}).then(response => response.json()).then(response => {
|
||||
for (x in response) {
|
||||
if (response[x].UserName !== globalConfig.nowplaying.jellyfin.target) { break } // If session does not belong to target specified in config, skip
|
||||
if (!response[x].NowPlayingItem) { break } // If the NowPlayingItem object is not present, skip (session is not playing anything)
|
||||
if (response[x].NowPlayingItem.MediaType !== "Audio") { break } // If not playing 'audio', skip, this might change in the future
|
||||
|
||||
return {
|
||||
"json": {
|
||||
"songName": response[x].NowPlayingItem.Name,
|
||||
"artistName": response[x].NowPlayingItem.Artists[0],
|
||||
"albumName": response.recenttracks.track[0].album["#text"],
|
||||
"artUrl": response.recenttracks.track[0].image[3]["#text"],
|
||||
"link": response.recenttracks.track[0].url
|
||||
},
|
||||
"html": `<img src="${response.recenttracks.track[0].image[3]["#text"]}" alt="Album Art" style="width: 10em;"> <div class="textlist"> <p>I'm listening to</p> <h3>${response.recenttracks.track[0].name} by ${response.recenttracks.track[0].artist["#text"]}</h3> <p>from ${response.recenttracks.track[0].album["#text"]}</p> <a href="${response.recenttracks.track[0].url}" class="noindent">View on Last.fm</a></div>`
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
export { queryLastfm }
|
||||
@@ -6,21 +6,7 @@
|
||||
* @param {string} extra Optional extra details to add to log, ideal for caught errors
|
||||
*/
|
||||
function logRequest(response,request,code,extra) {
|
||||
if (extra) {
|
||||
actualExtra = "; Extra: "+extra
|
||||
} else {
|
||||
actualExtra = ""
|
||||
}
|
||||
if (request.get("Authorization")) {
|
||||
actualAuth = `(${request.get("Authorization")})`
|
||||
} else {
|
||||
actualAuth = ""
|
||||
}
|
||||
// Client IP if connecting over Cloudflare, else IP as received by Express
|
||||
// | / Token used (if provided)
|
||||
// | / | Request Method Request Path Status code returned to client provided by function call
|
||||
// V V V V V V Extra information if provided by function call
|
||||
console.log(`${request.get("cf-connecting-ip") ?? request.ip}${actualAuth}${request.method} ${request.path} returned ${code}${actualExtra}`)
|
||||
console.log(`${request.get("cf-connecting-ip") ?? request.ip} ${request.get("Authorization") ?? ""} ${request.method} ${request.path} returned ${code} ${extra ?? ""}`)
|
||||
}
|
||||
|
||||
export { logRequest }
|
||||
Reference in New Issue
Block a user