diff --git a/lib/routes/avatars.js b/lib/routes/avatars.js index eb54f8d..b0dfa19 100644 --- a/lib/routes/avatars.js +++ b/lib/routes/avatars.js @@ -101,6 +101,6 @@ module.exports = function(req, callback) { }); } catch (e) { logging.error(req.id, "error:", e.stack); - handle_default(-1, userId, size, def, e, callback); + handle_default(-1, userId, size, def, req, e, callback); } }; \ No newline at end of file diff --git a/lib/routes/renders.js b/lib/routes/renders.js index ee4a6c2..3c85b2a 100644 --- a/lib/routes/renders.js +++ b/lib/routes/renders.js @@ -114,11 +114,11 @@ module.exports = function(req, callback) { }); } else { logging.log(rid, "image not found, using default."); - handle_default(rid, scale, helm, body, status, userId, scale, def, err, callback); + handle_default(rid, scale, helm, body, status, userId, scale, def, req, err, callback); } }); } catch(e) { logging.error(rid, "error:", e.stack); - handle_default(rid, scale, helm, body, -1, userId, scale, def, e, callback); + handle_default(rid, scale, helm, body, -1, userId, scale, def, req, e, callback); } }; \ No newline at end of file diff --git a/lib/routes/skins.js b/lib/routes/skins.js index 6c76044..5c178ed 100644 --- a/lib/routes/skins.js +++ b/lib/routes/skins.js @@ -4,7 +4,7 @@ var skins = require("../skins"); var path = require("path"); var lwip = require("lwip"); -function handle_default(img_status, userId, size, def, req, err, callback) { +function handle_default(img_status, userId, def, req, err, callback) { def = def || skins.default_skin(userId); if (def !== "steve" && def !== "alex") { if (helpers.id_valid(def)) { @@ -93,11 +93,11 @@ module.exports = function(req, callback) { err: err }); } else { - handle_default(2, userId, def, err, callback); + handle_default(2, userId, def, req, err, callback); } }); } catch(e) { logging.error(rid, "error:", e.stack); - handle_default(-1, userId, def, e, callback); + handle_default(-1, userId, def, req, e, callback); } }; \ No newline at end of file diff --git a/test/test.js b/test/test.js index 597f6a3..eef1372 100644 --- a/test/test.js +++ b/test/test.js @@ -640,6 +640,11 @@ describe("Crafatar", function() { etag: '"alex"', crc32: [737759773, 66512449] }, + "helm body render with non-existent uuid defaulting to userId": { + url: "http://localhost:3000/renders/body/00000000000000000000000000000000?scale=2&helm&default=alex", + etag: '"alex"', + crc32: [737759773, 66512449] + }, "helm body render with non-existent uuid defaulting to url": { url: "http://localhost:3000/renders/body/00000000000000000000000000000000?scale=2&helm&default=http://example.com", crc32: 0,