Merge pull request github#1016 from jongd/patch-1

Fix Giphy script

Author: tombell

src/scripts/giphy.coffee

@@ -1,21 +1,40 @@
 # Description:
 #   A way to search images on giphy.com
 #
+# Configuration:
+#   HUBOT_GIPHY_API_KEY
+#
 # Commands:
 #   hubot gif me <query> - Returns an animated gif matching the requested search term.
 
+giphy =
+  api_key: process.env.HUBOT_GIPHY_API_KEY
+  base_url: 'http://api.giphy.com/v1'
+
 module.exports = (robot) ->
   robot.respond /(gif|giphy)( me)? (.*)/i, (msg) ->
     giphyMe msg, msg.match[3], (url) ->
       msg.send url
 
 giphyMe = (msg, query, cb) ->
-  q = q: query
-  msg.http('http://giphy.com/api/gifs/search')
-    .query(q)
+  endpoint = '/gifs/search'
+  url = "#{giphy.base_url}#{endpoint}"
+
+  msg.http(url)
+    .query
+      q: query
+      api_key: giphy.api_key
     .get() (err, res, body) ->
-      response = JSON.parse(body)
-      images = response.data.gifs
-      if images.length > 0
-        image = msg.random images
-        cb image.original_url
+      response = undefined
+      try
+        response = JSON.parse(body)
+        images = response.data
+        if images.length > 0
+          image = msg.random images
+          cb image.images.original.url
+
+      catch e
+        response = undefined
+        cb 'Error'
+
+      return if response is undefined