Returns HTTP Error if any in XKCD plugin

This commit is contained in:
yago 2015-02-02 23:18:46 +01:00
parent da91a550fc
commit 4305c7b87e

View File

@ -1,18 +1,19 @@
function get_xkcd() function get_xkcd()
first_url = http.request("http://xkcd.com/info.0.json") -- Get the latest num
local xcomicinfo = json:decode(first_url) local res,code = https.request("http://xkcd.com/info.0.json")
math.randomseed(os.time()) if code ~= 200 then return "HTTP ERROR" end
i = math.random(1,xcomicinfo.num) local data = json:decode(res)
b = http.request("http://xkcd.com/" .. i .. "/info.0.json") math.randomseed(os.time())
local comicjson = json:decode(b) i = math.random(1, data.num) -- Latest
local link_image = comicjson.img local res,code = http.request("http://xkcd.com/"..i.."/info.0.json")
c = http.request(link_image) if code ~= 200 then return "HTTP ERROR" end
local title = comicjson.title local data = json:decode(res)
if link_image:sub(0,2) == '//' then local link_image = data.img
link_image = msg.text:sub(3,-1) if link_image:sub(0,2) == '//' then
end link_image = msg.text:sub(3,-1)
return link_image, title end
return link_image, data.title
end end
function send_title(cb_extra, success, result) function send_title(cb_extra, success, result)
@ -30,9 +31,8 @@ function run(msg, matches)
end end
return { return {
description = "send random comic image from xkcd", description = "Send random comic image from xkcd",
usage = "!xkcd", usage = "!xkcd",
patterns = {"^!xkcd$"}, patterns = {"^!xkcd$"},
run = run run = run
} }