1 files changed, 14 insertions, 2 deletions

diff --git a/bot.lua b/bot.lua
index 8604dad..de71d4a 100644
--- a/bot.lua
+++ b/bot.lua
@@ -72,8 +72,9 @@ function furrybot.http_request(url, name, callback)
 end
 
 function furrybot.json_http_request(url, name, callback)
-	furrybot.http_request(url, name, function(data)
-		callback(minetest.parse_json(data)[1])
+	furrybot.http_request(url, name, function(raw)
+		local data = minetest.parse_json(raw)
+		callback(data[1] or data)
 	end)
 end
 
@@ -209,6 +210,17 @@ end
 
 furrybot.commands.dicksize = furrybot.commands.cocksize
 
+function furrybot.commands.joke(name, first, last)
+	if not first then
+		first = "Chuck"
+		last = "Norris"
+	end
+	furrybot.json_http_request("http://api.icndb.com/jokes/random?firstName=" .. first .. "&lastName=" .. (last or ""), name, function(data)
+		local joke = data.value.joke:gsub(""", "\""):gsub("  ", " ")
+		furrybot.send(joke)
+	end)
+end
+
 if furrybot.loaded then
 	furrybot.send("Reloaded")
 else