From 7d47028ff76469d22633cd6a08c63180ab8ea919 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Sun, 30 Nov 2014 03:34:37 +0100
Subject: [PATCH] fix errors for null skins, closes #20

---
 modules/helpers.js           |  11 +++++++----
 public/images/alex_skin.png  | Bin 0 -> 1929 bytes
 public/images/steve_skin.png | Bin 0 -> 1208 bytes
 routes/skins.js              |   7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 public/images/alex_skin.png
 create mode 100644 public/images/steve_skin.png

diff --git a/modules/helpers.js b/modules/helpers.js
index 0c91ef2..2669025 100644
--- a/modules/helpers.js
+++ b/modules/helpers.js
@@ -124,7 +124,7 @@ exp.get_image_hash = function(uuid, callback) {
 };
 
 
-// handles requests for +uuid+ images with +size+
+// handles requests for +uuid+ avatars with +size+
 // callback contains error, status, image buffer, hash
 // image is the user's face+helm when helm is true, or the face otherwise
 // for status, see get_image_hash
@@ -154,20 +154,23 @@ exp.get_avatar = function(uuid, helm, size, callback) {
   });
 };
 
+// handles requests for +uuid+ skins
+// callback contains error, hash, image buffer
 exp.get_skin = function(uuid, callback) {
-  logging.log("\nskin request: " + uuid);
+  logging.log(uuid + " skin request");
   exp.get_image_hash(uuid, function(err, status, hash) {
     if (hash) {
       var skinurl = "http://textures.minecraft.net/texture/" + hash;
       networking.get_skin(skinurl, function(err, img) {
         if (err) {
-          logging.log("\nerror while downloading skin");
+          logging.error("error while downloading skin");
           callback(err, hash, null);
         } else {
-          logging.log("\nreturning skin");
           callback(null, hash, img);
         }
       });
+    } else {
+      callback(err, null, null);
     }
   });
 };
diff --git a/public/images/alex_skin.png b/public/images/alex_skin.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbbfd0fb260757e1484dbf9b56cb8bec3ca1497c
GIT binary patch
literal 1929
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

literal 0
HcmV?d00001

diff --git a/public/images/steve_skin.png b/public/images/steve_skin.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7981a929474f5769c6f140296d5488e5736e1bf
GIT binary patch
literal 1208
zcmV;p1V{UcP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw0003dP)t-s0000g9StNH2p<p&
zbw@8R9}j9kFosh!CK?JOBO_8MCMg^YC>shV8w)Zc5G^1OFCYyo9t|iQ3oITEGb9m0
zDiS{`6($%9D;^Fg8w(^D3bu)Cy^eCmmVmvBa=ngptae&7B@!qa4J{oGFCr1DeP*<T
zZLNT9oN`>diE^B2OePu(BNqvWSUQ|zMLH-H|Ns9|J&Cn@XDl8Ogi<k<UqOgkIh<og
zvwLE<f^xoyY@%vMfKxPLLoc0bPnu&ykX}QUUqE+4HIH6Cfm1o0XGn@!J9J1dZ$&I^
zLn?YsGlNw-pJ+*%WJ*>^%qS=*0L;t)U|;~Ks8KN`Feq{+AzMZ|r8+T*0Dpe~TU!8`
znE;-i0I#nAXlRF3JC<)-KR-WfYionnLRJ6(00DGTPE!Ct=GbNc0004EOGiX7uG}r;
z0009ANkl<ZSi|j>X<OPr5XTLYqfL;;*rN6ZW9zNe*uyHeMQybQT?0urn}mM<FVWdu
zRw0N9@Rt9>!%mL*Wo9!lGc(hbBo*LOm@RfSGpeM5ECZlWR8&P(#{tN)#sLpN%IJWC
zOmmQ>u>s(#Y4Rih<}Uyb#{g)uuFX;a(-;6<14+`zuhB5Hl0H{1KQiU{f@VtP@|<4M
z3`5jK9)M=)=7MRO3y+^z^9!bKX%x_{i%fu3(e%ZoW!-%G?D>nAuU_lRON+Wzu|!>D
zM^LR<M#);SSM4`%*Vflptde2Xs)neG94QzZn_JsEtGj#e*7kPoo$am74LB+4A_t&a
z**|a&-+%b1D4&i#A36v7l`7ptUKiPWVAPIJ>T2=y%U961Mp3Pw9M=p>)I}yhRqN`R
zbAIvtN276hb#-}h{`2hDSsi|mv@VKju3GpF`U4WjO<qgQzg>y*sM$oywQ`*e;N?63
zXo4mMAn;cvN?`!tx-GX2f`zW0@B0A`8%K>s7=rDG2q8ic;x=I`0o?*xeSo$fMLt3y
z_!9zlgy`J>0MjRkg!Fm};PwI7jRb`lJi(3#7h+(-p!WlUC<@?uh~bOdm>|pn5Y#;p
zfZ>6nAP6v~ZWx0ZFmE_^94EFxF&K312Y6na?ga&aPlWkHF~B0i4iE<<w(Z1s0ebg<
z0w4gy0I&zt8z3<UBn*%wJpk7ocnbpHvrW7K&?i$s+#i7exVHepya*N>Mg@Kx;G_VZ
zjsSEz|3H4^`xw&zH~?(64Gss`4vhp-=>c#@u|g^>3T%4-phf0+2xG6!0g25b$pEm3
zfPh7LWB8&^2EQauM=;e?Q%!ZB(#;kP>&kfnbS{_(fQAhgqoj}<&^s@9v`>KGKRz6o
z3$g*Nn?@5tlkmH(K0m;1^>!*W(AGx*+&LEv1*GPMp>x4-K#R`{HvrMn@&ZyRP(Z=~
zao=2!4dAK748Xc_oHGJ91#mbZ&Iw4*3r;t8I@-`wasc|<J$rI82>^0W5;of03HT4%
WbDDT8hKaEN0000<MNUMnLSTaR9o=yN

literal 0
HcmV?d00001

diff --git a/routes/skins.js b/routes/skins.js
index e93b5ff..76f6340 100644
--- a/routes/skins.js
+++ b/routes/skins.js
@@ -4,6 +4,7 @@ var helpers = require("../modules/helpers");
 var config = require("../modules/config");
 var router = require("express").Router();
 var skins = require("../modules/skins");
+var lwip = require("lwip");
 
 /* GET skin request. */
 router.get("/:uuid.:ext?", function(req, res) {
@@ -61,8 +62,10 @@ router.get("/:uuid.:ext?", function(req, res) {
       res.end();
     } else {
       def = def || skins.default_skin(uuid);
-      skins.resize_img("public/images/" + def + ".png", size, function(err, image) {
-        sendimage(http_status, image);
+      lwip.open("public/images/" + def + "_skin.png", function(err, image) {
+        image.toBuffer("png", function(err, buffer) {
+          sendimage(http_status, buffer);
+        });
       });
     }
   }