Fix spotify formatting mess [Close #459]

This commit is contained in:
reality 2013-05-21 14:52:46 +00:00
parent 648b44b298
commit 33bd617a4f

View File

@ -1,8 +1,12 @@
/**
* Name: Spotify
* Description: Various Spotify functionality
*/
var request = require('request'),
_ = require('underscore')._;
var spotify = function(dbot) {
/* examples:
/* Examples:
* http://open.spotify.com/track/42SYMWISn7xUpTNPLw9V5E
* spotify:track:42SYMWISn7xUpTNPLw9V5E
* http://open.spotify.com/artist/3yY2gUcIsjMr8hjo51PoJ8
@ -14,24 +18,34 @@ var spotify = function(dbot) {
this.spotifyLookup = 'http://ws.spotify.com/lookup/1/.json';
this.spotifySearch = 'http://ws.spotify.com/search/1/track.json';
this.youtubeRegex = /^http:\/\/(?:www\.)?youtube.com\/watch\?v=\w+(&\S*)?$/
this.spotifyText = "\u00039spotify\u000f";
this.spotifyText = '\u00039spotify\u000f';
this.lookup = function(event, link) {
request({
url: this.spotifyLookup,
qs: {uri: link},
json: true
'url': this.spotifyLookup,
'qs': { 'uri': link },
'json': true
}, function(error, response, body) {
if (!error && response.statusCode == 200) {
var spotify = "\u00039spotify\u000f";
if (_.has(body, 'track')) {
event.reply(dbot.t("track", {s: spotify, artist: _.map(body.track.artists, function(a) { return a.name }).join(', '), album: body.track.album.name, track: body.track.name}));
}
else if (_.has(body, 'album')) {
event.reply(dbot.t("album", {s: spotify, artist: body.album.artist, album: body.album.name}));
}
else if (_.has(body, 'artist')) {
event.reply(dbot.t("artist", {s: spotify, artist: body.artist.name}));
if(!error && response.statusCode == 200) {
if(_.has(body, 'track')) {
event.reply(dbot.t('track', {
's': this.spotifyText,
'artist': _.map(body.track.artists,
function(a) { return a.name }).join(', '),
'album': body.track.album.name,
'track': body.track.name
}));
} else if(_.has(body, 'album')) {
event.reply(dbot.t('album', {
's': this.spotifyText,
'artist': body.album.artist,
'album': body.album.name
}));
} else if(_.has(body, 'artist')) {
event.reply(dbot.t('artist', {
's': this.spotifyText,
'artist': body.artist.name
}));
}
}
});
@ -40,12 +54,12 @@ var spotify = function(dbot) {
this.api = {
'spotifySearch': function(query, callback) {
request({
url: this.spotifySearch,
qs: {q: query},
json: true
'url': this.spotifySearch,
'qs': { 'q': query },
'json': true
}, function(error, response, body) {
if (!error && response.statusCode == 200) {
if (_.has(body, 'tracks') && body.tracks[0] && _.has(body.tracks[0], 'href')) {
if(!error && response.statusCode == 200) {
if(_.has(body, 'tracks') && body.tracks[0] && _.has(body.tracks[0], 'href')) {
var t = body.tracks[0].href;
t = t.replace(/:/g, '/');
t = t.replace(/spotify/, 'http://open.spotify.com');
@ -63,16 +77,16 @@ var spotify = function(dbot) {
var query = event.input[1];
this.api.spotifySearch(query, function(body, t) {
if(body) {
event.reply(dbot.t("found", {
s: this.spotifyText,
artist: _.map(body.tracks[0].artists, function(a) {
event.reply(dbot.t('found', {
's': this.spotifyText,
'artist': _.map(body.tracks[0].artists, function(a) {
return a.name }).join(', '),
album: body.tracks[0].album.name,
track: body.tracks[0].name,
url: t
'album': body.tracks[0].album.name,
'track': body.tracks[0].name,
'url': t
}));
} else {
event.reply(dbot.t("not-found", {s: spotify}));
event.reply(dbot.t('not-found', { 's': this.spotifyText }));
}
}.bind(this));
},
@ -88,13 +102,13 @@ var spotify = function(dbot) {
name = title.replace(' - YouTube', '');
this.api.spotifySearch(name, function(body, t) {
if(body) {
event.reply(dbot.t("found", {
s: this.spotifyText,
artist: _.map(body.tracks[0].artists, function(a) {
return a.name }).join(', '),
album: body.tracks[0].album.name,
track: body.tracks[0].name,
url: t
event.reply(dbot.t('found', {
's': this.spotifyText,
'artist': _.map(body.tracks[0].artists,
function(a) { return a.name }).join(', '),
'album': body.tracks[0].album.name,
'track': body.tracks[0].name,
'url': t
}));
} else {
event.reply('No results');
@ -102,7 +116,7 @@ var spotify = function(dbot) {
}.bind(this));
}.bind(this));
} else {
event.reply("That's not a YouTube link");
event.reply('That\'s not a YouTube link');
}
}
};