Comparing version 2.5.0 to 2.6.0
{ | ||
"name": "widenbot", | ||
"version": "2.5.0", | ||
"version": "2.6.0", | ||
"description": "Slack bot for Widen", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -97,9 +97,11 @@ var | ||
function LastFm_track_getInfo(lastFm, track) | ||
function LastFm_artist_getTopTags(lastFm, artist) | ||
{ | ||
return new promise(function(resolve, reject){ | ||
var params = { | ||
return lastFm.request('artist.getTopTags', { | ||
'artist': artist, | ||
'limit': 5, | ||
handlers: { | ||
success: function(data) { | ||
resolve(data.track); | ||
resolve(data.toptags.tag || []); | ||
}, | ||
@@ -110,13 +112,5 @@ error: function(e) { | ||
} | ||
}; | ||
}); | ||
}); | ||
if (track.mbid) { | ||
params.mbid = track.mbid; | ||
} else { | ||
params.track = track.name; | ||
params.artist = track.artist['#text']; | ||
} | ||
return lastFm.request('track.getInfo', params); | ||
}); | ||
} | ||
@@ -147,16 +141,5 @@ | ||
LastFm_track_getInfo(lastFm, track).then(function(trackInfo){ | ||
var tags = trackInfo.toptags; | ||
LastFm_artist_getTopTags(lastFm, artist).then(function(artistTags){ | ||
if (tags.tag) { | ||
tags = tags.tag.map(function(t){ | ||
return { | ||
name: t.name, | ||
url: t.url | ||
}; | ||
}); | ||
} else { | ||
tags = []; | ||
} | ||
var tags = []; | ||
resolve({ | ||
@@ -177,3 +160,3 @@ album: { | ||
imgUrl: imgUrl, | ||
tags: tags | ||
tags: artistTags.slice(0,5) | ||
}); | ||
@@ -197,3 +180,2 @@ | ||
console.log(track); | ||
var | ||
@@ -200,0 +182,0 @@ postTemplate = '[ *<%= name.name %>* ] _by_ [ *<%= artist.name %>* ] _on_ [ *<%= album.name %>* ] [ _<%= tags.map(function(t){return t.name;}).join(", ") %>_ ]- <%= imgUrl %>', |
216116
1458