Comparing version 2.4.0 to 2.4.1
{ | ||
"name": "widenbot", | ||
"version": "2.4.0", | ||
"version": "2.4.1", | ||
"description": "Slack bot for Widen", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -97,7 +97,6 @@ var | ||
function LastFm_track_getInfo(lastFm, trackid) | ||
function LastFm_track_getInfo(lastFm, track) | ||
{ | ||
return new promise(function(resolve, reject){ | ||
lastFm.request('track.getInfo', { | ||
'mbid': trackid, | ||
var params = { | ||
handlers: { | ||
@@ -111,3 +110,12 @@ success: function(data) { | ||
} | ||
}); | ||
}; | ||
if (track.mbid) { | ||
params.mbid = track.mbid; | ||
} else { | ||
params.track = track.name; | ||
params.artist = track.artist['#text']; | ||
} | ||
return lastFm.request('track.getInfo', params); | ||
}); | ||
@@ -139,11 +147,15 @@ } | ||
LastFm_track_getInfo(lastFm, track.mbid).then(function(track){ | ||
var tags = track.toptags; | ||
LastFm_track_getInfo(lastFm, track).then(function(trackInfo){ | ||
var tags = trackInfo.toptags; | ||
tags = tags.tag.map(function(t){ | ||
return { | ||
name: t.name, | ||
url: t.url | ||
}; | ||
}); | ||
if (tags.tag) { | ||
tags = tags.tag.map(function(t){ | ||
return { | ||
name: t.name, | ||
url: t.url | ||
}; | ||
}); | ||
} else { | ||
tags = []; | ||
} | ||
@@ -184,4 +196,5 @@ resolve({ | ||
console.log(track); | ||
var | ||
postTemplate = '[ *<%= name.name %>* ] _by_ [ *<%= artist.name %>* ] _on_ [ *<%= album.name %>* ] { _<%= tags.map(function(t){return t.name;}).join(", ") %>_ }- <%= imgUrl %>', | ||
postTemplate = '[ *<%= name.name %>* ] _by_ [ *<%= artist.name %>* ] _on_ [ *<%= album.name %>* ] [ _<%= tags.map(function(t){return t.name;}).join(", ") %>_ ]- <%= imgUrl %>', | ||
post = _.template(postTemplate, track); | ||
@@ -188,0 +201,0 @@ |
187659
36
1470