azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

less confusing var names

Browse Source 
so 'type' was actually a hash *of* some type
This commit is contained in:
jomo 2015-02-01 21:43:43 +01:00
parent 045ffbd63f
commit 0f136b941f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/helpers.js
View File

@ -178,29 +178,31 @@ exp.id_valid = function(userId) {
// 1: "cached" - found on disk // 1: "cached" - found on disk
// 2: "downloaded" - profile downloaded, skin downloaded from mojang servers // 2: "downloaded" - profile downloaded, skin downloaded from mojang servers
// 3: "checked" - profile re-downloaded (was too old), but it has either not changed or has no skin // 3: "checked" - profile re-downloaded (was too old), but it has either not changed or has no skin
exp.get_image_hash = function(rid, userId, raw_type, callback) { exp.get_image_hash = function(rid, userId, type, callback) {
cache.get_details(userId, function(err, details) { cache.get_details(userId, function(err, details) {
var type = (details !== null ? (raw_type === "skin" ? details.skin : details.cape) : null); var hash = details !== null ? (type === "skin" ? details.skin : details.cape) : null;
if (err) { if (err) {
callback(err, -1, null); callback(err, -1, null);
} else { } else {
if (details && details.time + config.local_cache_time * 1000 >= new Date().getTime()) { if (details && details.time + config.local_cache_time * 1000 >= new Date().getTime()) {
// use cached image
logging.log(rid + "userId cached & recently updated"); logging.log(rid + "userId cached & recently updated");
callback(null, (type ? 1 : 0), type); callback(null, (hash ? 1 : 0), hash);
} else { } else {
// download image
if (details) { if (details) {
logging.log(rid + "userId cached, but too old"); logging.log(rid + "userId cached, but too old");
} else { } else {
logging.log(rid + "userId not cached"); logging.log(rid + "userId not cached");
} }
store_images(rid, userId, details, raw_type, function(err, hash) { store_images(rid, userId, details, type, function(err, new_hash) {
if (err) { if (err) {
callback(err, -1, details && type); callback(err, -1, details && hash);
} else { } else {
var status = details && (type === hash) ? 3 : 2; var status = details && (hash === new_hash) ? 3 : 2;
logging.debug(rid + "old hash: " + (details && type)); logging.debug(rid + "old hash: " + (details && hash));
logging.log(rid + "hash: " + hash); logging.log(rid + "new hash: " + new_hash);
callback(null, status, hash); callback(null, status, new_hash);
} }
}); });
} }