From 5f0bcd771060fa9241b78ec0b0e47817d51caf0c Mon Sep 17 00:00:00 2001 From: Daniel Dowling Date: Wed, 30 Jan 2013 17:28:34 +0000 Subject: [PATCH] Update modules/link/link.js Tab fix attempt 2 --- modules/link/link.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/modules/link/link.js b/modules/link/link.js index 37d4945..5382f56 100644 --- a/modules/link/link.js +++ b/modules/link/link.js @@ -34,11 +34,10 @@ var link = function(dbot) { }, '~xkcd': function(event) { - var comicId = event.params[1]; - - if(comicId == "*"){ - request("http://xkcd.com/info.0.json", function(error, response, body){ - if (response.statusCode == "200") { + var comicId = event.params[1]; + if(comicId == "*"){ + request("http://xkcd.com/info.0.json", function(error, response, body){ + if (response.statusCode == "200") { data = JSON.parse(body); comicId = data.num; comicId = (Math.floor(Math.random() * comicId) + 1); @@ -47,21 +46,21 @@ var link = function(dbot) { event.params = event.message.split(' '); dbot.instance.emit(event); } - }); - }else { - if(comicId){ - comicId = comicId + "/"; - } else { - comicId = ""; - } - var link = "http://xkcd.com/"+comicId+"info.0.json"; - request(link, function(error, response, body) { - if (response.statusCode == "200") { - data = JSON.parse(body); - event.reply(dbot.t("xkcd",data)); - } else { - event.reply(dbot.t("no-hits")); - } + }); + }else { + if(comicId){ + comicId = comicId + "/"; + } else { + comicId = ""; + } + var link = "http://xkcd.com/"+comicId+"info.0.json"; + request(link, function(error, response, body) { + if (response.statusCode == "200") { + data = JSON.parse(body); + event.reply(dbot.t("xkcd",data)); + } else { + event.reply(dbot.t("no-hits")); + } }); } },