From 33bd617a4f83c24767c21ffc44d250b390c8116f Mon Sep 17 00:00:00 2001 From: reality Date: Tue, 21 May 2013 14:52:46 +0000 Subject: [PATCH] Fix spotify formatting mess [Close #459] --- modules/spotify/spotify.js | 230 ++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 108 deletions(-) diff --git a/modules/spotify/spotify.js b/modules/spotify/spotify.js index f937ff9..729ec88 100644 --- a/modules/spotify/spotify.js +++ b/modules/spotify/spotify.js @@ -1,121 +1,135 @@ +/** + * Name: Spotify + * Description: Various Spotify functionality + */ var request = require('request'), - _ = require('underscore')._; + _ = require('underscore')._; var spotify = function(dbot) { - /* examples: - * http://open.spotify.com/track/42SYMWISn7xUpTNPLw9V5E - * spotify:track:42SYMWISn7xUpTNPLw9V5E - * http://open.spotify.com/artist/3yY2gUcIsjMr8hjo51PoJ8 - * spotify:artist:3yY2gUcIsjMr8hjo51PoJ8 - * http://open.spotify.com/album/30g571JKoxs8AnsgAViV2J - * spotify:album:30g571JKoxs8AnsgAViV2J - */ - this.spotifyRegex = /(\b(https?:\/\/open.spotify.com\/(artist|track|album)\/\w*|spotify:(artist|track|album):\w*)\b)/ig; - 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"; + /* Examples: + * http://open.spotify.com/track/42SYMWISn7xUpTNPLw9V5E + * spotify:track:42SYMWISn7xUpTNPLw9V5E + * http://open.spotify.com/artist/3yY2gUcIsjMr8hjo51PoJ8 + * spotify:artist:3yY2gUcIsjMr8hjo51PoJ8 + * http://open.spotify.com/album/30g571JKoxs8AnsgAViV2J + * spotify:album:30g571JKoxs8AnsgAViV2J + */ + this.spotifyRegex = /(\b(https?:\/\/open.spotify.com\/(artist|track|album)\/\w*|spotify:(artist|track|album):\w*)\b)/ig; + 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.lookup = function(event, link) { - request({ - 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})); - } - } - }); - }; + this.lookup = function(event, link) { + request({ + 'url': this.spotifyLookup, + 'qs': { 'uri': link }, + 'json': true + }, function(error, response, body) { + 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 + })); + } + } + }); + }; - this.api = { - 'spotifySearch': function(query, callback) { - request({ - 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')) { - var t = body.tracks[0].href; - t = t.replace(/:/g, '/'); - t = t.replace(/spotify/, 'http://open.spotify.com'); - callback(body, t); - } else { - callback(false); - } - } - }); - } - }; - - var commands = { - '~spotify': function(event) { - 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) { - return a.name }).join(', '), - album: body.tracks[0].album.name, - track: body.tracks[0].name, - url: t - })); - } else { - event.reply(dbot.t("not-found", {s: spotify})); - } - }.bind(this)); - }, - - '~syt': function(event) { - var lastLink = dbot.modules.link.links[event.channel.name]; - if(!_.isUndefined(event.params[1])) { - lastLink = event.params[1]; - } - - if(lastLink.match(this.youtubeRegex)) { - dbot.api.link.getTitle(lastLink, function(title) { - 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 - })); + this.api = { + 'spotifySearch': function(query, callback) { + request({ + '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')) { + var t = body.tracks[0].href; + t = t.replace(/:/g, '/'); + t = t.replace(/spotify/, 'http://open.spotify.com'); + callback(body, t); } else { - event.reply('No results'); + callback(false); } - }.bind(this)); - }.bind(this)); - } else { - event.reply("That's not a YouTube link"); + } + }); } - } - }; - commands['~spotify'].regex = [/^~spotify (.*)/, 2]; - this.commands = commands; + }; - this.onLoad = function() { - dbot.api.link.addHandler(this.name, this.spotifyRegex, function(event, matches, name) { - this.lookup(event, matches[0]); - }.bind(this)); - }.bind(this); + var commands = { + '~spotify': function(event) { + 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) { + return a.name }).join(', '), + 'album': body.tracks[0].album.name, + 'track': body.tracks[0].name, + 'url': t + })); + } else { + event.reply(dbot.t('not-found', { 's': this.spotifyText })); + } + }.bind(this)); + }, + + '~syt': function(event) { + var lastLink = dbot.modules.link.links[event.channel.name]; + if(!_.isUndefined(event.params[1])) { + lastLink = event.params[1]; + } + + if(lastLink.match(this.youtubeRegex)) { + dbot.api.link.getTitle(lastLink, function(title) { + 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 + })); + } else { + event.reply('No results'); + } + }.bind(this)); + }.bind(this)); + } else { + event.reply('That\'s not a YouTube link'); + } + } + }; + commands['~spotify'].regex = [/^~spotify (.*)/, 2]; + this.commands = commands; + + this.onLoad = function() { + dbot.api.link.addHandler(this.name, this.spotifyRegex, function(event, matches, name) { + this.lookup(event, matches[0]); + }.bind(this)); + }.bind(this); }; exports.fetch = function(dbot) { - return new spotify(dbot); + return new spotify(dbot); };