Merge pull request #1249 from phillc/master

Update to aww me

Author: technicalpickles

src/scripts/aww.coffee

@@ -13,20 +13,32 @@
 # Author:
 #   eliperkins
 
+url = require("url")
+
 module.exports = (robot) ->
   robot.respond /aww/i, (msg) ->
     search = escape(msg.match[1])
     msg.http('http://www.reddit.com/r/aww.json')
       .get() (err, res, body) ->
         result = JSON.parse(body)
 
-        if result.data.children.count <= 0
-          msg.send "Couldn't find anything cute..."
-          return
-        
         urls = [ ]
         for child in result.data.children
-          urls.push(child.data.url)
-          
+          if child.data.domain != "self.aww"
+            urls.push(child.data.url)
+
+        if urls.count <= 0
+          msg.send "Couldn't find anything cute..."
+          return
+
         rnd = Math.floor(Math.random()*urls.length)
-        msg.send urls[rnd]
+        picked_url = urls[rnd]
+
+        parsed_url = url.parse(picked_url)
+        if parsed_url.host == "imgur.com"
+          parsed_url.host = "i.imgur.com"
+          parsed_url.pathname = parsed_url.pathname + ".jpg"
+
+          picked_url = url.format(parsed_url)
+
+        msg.send picked_url