Merge branch 'master' of git://github.com/benjamine/hubot-scripts into benjamine-master

Conflicts:
	src/scripts/meme_captain.coffee

Author: tombell

src/scripts/meme_captain.coffee

@@ -78,19 +78,28 @@ module.exports = (robot) ->
 
 
 memeGenerator = (msg, imageName, text1, text2, callback) ->
-  imageUrl = "http://v1.memecaptain.com/" + imageName
-  msg.http("http://v1.memecaptain.com/g")
-  .query(
-    u: imageUrl,
-    t1: text1,
-    t2: text2
-  ).get() (err, res, body) ->
+  imageUrl = "http://memecaptain.com/" + imageName
+
+  processResult = (err, res, body) ->
     return msg.send err if err
-    result = JSON.parse(body)
+    if res.statusCode == 301
+      msg.http(res.headers.location).get() processResult
+      return
+    if res.statusCode > 300
+      msg.reply "Sorry, I couldn't generate that meme. Unexpected status from memecaption.com: #{res.statusCode}"
+      return
+    try
+      result = JSON.parse(body)
+    catch error
+      msg.reply "Sorry, I couldn't generate that meme. Unexpected response from memecaptain.com: #{body}"
     if result? and result['imageUrl']?
       callback result['imageUrl']
     else
       msg.reply "Sorry, I couldn't generate that meme."
 
-
-
+  msg.http("http://memecaptain.com/g")
+  .query(
+    u: imageUrl,
+    t1: text1,
+    t2: text2
+  ).get() processResult