Show previous scrobble too
This commit is contained in:
parent
ecd26427a2
commit
18182c0059
1 changed files with 20 additions and 14 deletions
|
@ -22,9 +22,21 @@ module.exports = async function(userID, guild) {
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
let scrobble = {};
|
let scrobble = {};
|
||||||
|
let tracks = [];
|
||||||
let track;
|
let track;
|
||||||
try {
|
try {
|
||||||
track = data.recenttracks.track[0];
|
for(let i = 0; i < 2; i++){
|
||||||
|
track = data.recenttracks.track[i];
|
||||||
|
scrobble.artist = track.artist["#text"];
|
||||||
|
scrobble.song = track.name;
|
||||||
|
scrobble.album = track.album["#text"];
|
||||||
|
scrobble.cover = track.image[3]["#text"];
|
||||||
|
if(track['@attr'] != undefined || track['@attr'].nowplaying !== "true"){
|
||||||
|
isCurrentScrobble = "Last";
|
||||||
|
}
|
||||||
|
tracks.push(scrobble);
|
||||||
|
}
|
||||||
|
resolve(scrobble);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
scrobble.error = true;
|
scrobble.error = true;
|
||||||
if(data.error === 6){
|
if(data.error === 6){
|
||||||
|
@ -34,14 +46,6 @@ module.exports = async function(userID, guild) {
|
||||||
scrobble.errorMsg = "Last.fm is probably having problems. Try again later.";
|
scrobble.errorMsg = "Last.fm is probably having problems. Try again later.";
|
||||||
resolve(scrobble);
|
resolve(scrobble);
|
||||||
}
|
}
|
||||||
scrobble.artist = track.artist["#text"];
|
|
||||||
scrobble.song = track.name;
|
|
||||||
scrobble.album = track.album["#text"];
|
|
||||||
scrobble.cover = track.image[3]["#text"];
|
|
||||||
if(track['@attr'].nowplaying === "true"){
|
|
||||||
isCurrentScrobble = "Last";
|
|
||||||
}
|
|
||||||
resolve(scrobble);
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
@ -54,14 +58,16 @@ module.exports = async function(userID, guild) {
|
||||||
}
|
}
|
||||||
const embed = new Discord.MessageEmbed()
|
const embed = new Discord.MessageEmbed()
|
||||||
.setAuthor(`Now playing - ${nickname}`, user.user.avatarURL({ dynamic: true, size: 4096 }))
|
.setAuthor(`Now playing - ${nickname}`, user.user.avatarURL({ dynamic: true, size: 4096 }))
|
||||||
.setThumbnail(scrobble.cover)
|
.setThumbnail(tracks[0].cover)
|
||||||
.setColor(15780145)
|
.setColor(15780145)
|
||||||
.addFields({
|
.addFields({
|
||||||
name: "Current:", value: `${scrobble.song}\n **${scrobble.artist} • ** ${scrobble.album}`
|
name: `${isCurrentScrobble}:`, value: `${tracks[0].song}\n **${tracks[0].artist} • ** ${tracks[0].album}`
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Previous:", value: `**TODO: Make this show the previous scrobble**`
|
|
||||||
},)
|
},)
|
||||||
|
if(isCurrentScrobble === "Current"){
|
||||||
|
embed.addFields({
|
||||||
|
name: "Previous:", value: `${tracks[1].song}\n **${tracks[1].artist} • ** ${tracks[1].album}`
|
||||||
|
},)
|
||||||
|
}
|
||||||
sendText.embed = embed;
|
sendText.embed = embed;
|
||||||
} else {
|
} else {
|
||||||
sendText.text = "You haven't set your last.fm username yet. Use `<prefix>fm set <lastfm_username>` to set it.";
|
sendText.text = "You haven't set your last.fm username yet. Use `<prefix>fm set <lastfm_username>` to set it.";
|
||||||
|
|
Loading…
Add table
Reference in a new issue