mirror of
https://github.com/azures04/crafatar.git
synced 2026-05-06 11:00:39 +02:00
Merge
This commit is contained in:
@@ -15,7 +15,7 @@ var human_status = {
|
||||
|
||||
/* GET avatar request. */
|
||||
router.get("/:uuid.:ext?", function(req, res) {
|
||||
var uuid = req.params.uuid;
|
||||
var uuid = (req.params.uuid || "");
|
||||
var size = parseInt(req.query.size) || config.default_size;
|
||||
var def = req.query.default;
|
||||
var helm = req.query.hasOwnProperty("helm");
|
||||
@@ -33,8 +33,8 @@ router.get("/:uuid.:ext?", function(req, res) {
|
||||
return;
|
||||
}
|
||||
|
||||
// strip dashes, to lower case
|
||||
uuid = uuid.replace(/-/g, "").toLowerCase();
|
||||
// strip dashes
|
||||
uuid = uuid.replace(/-/g, "");
|
||||
|
||||
try {
|
||||
helpers.get_avatar(uuid, helm, size, function(err, status, image, hash) {
|
||||
|
||||
@@ -8,7 +8,7 @@ var lwip = require("lwip");
|
||||
|
||||
/* GET skin request. */
|
||||
router.get("/:uuid.:ext?", function(req, res) {
|
||||
var uuid = req.params.uuid;
|
||||
var uuid = (req.params.uuid || "");
|
||||
var def = req.query.default;
|
||||
var start = new Date();
|
||||
var etag = null;
|
||||
@@ -18,8 +18,8 @@ router.get("/:uuid.:ext?", function(req, res) {
|
||||
return;
|
||||
}
|
||||
|
||||
// strip dashes, to lower case
|
||||
uuid = uuid.replace(/-/g, "").toLowerCase();
|
||||
// strip dashes
|
||||
uuid = uuid.replace(/-/g, "");
|
||||
|
||||
try {
|
||||
helpers.get_skin(uuid, function(err, hash, image) {
|
||||
|
||||
Reference in New Issue
Block a user