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

check if +type+ is present when reading from cache, fixes #101 tests

Browse Source
This commit is contained in:
jomo 2015-02-22 02:21:35 +01:00
parent 5e4a6d5bbe
commit 7d8b629f33
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/helpers.js
View File

@ -196,7 +196,7 @@ exp.id_valid = function(userId) {
return valid_user_id.test(userId); return valid_user_id.test(userId);
}; };
// decides whether to get an image from disk or to download it // decides whether to get a +type+ image for +userId+ from disk or to download it
// callback contains error, status, hash // callback contains error, status, hash
// the status gives information about how the image was received // the status gives information about how the image was received
// -1: "error" // -1: "error"
@ -206,11 +206,11 @@ exp.id_valid = function(userId) {
// 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, 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 cached_hash = details !== null ? (type === "skin" ? details.skin : details.cape) : null; var cached_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[type] !== undefined && details.time + config.local_cache_time * 1000 >= new Date().getTime()) {
// use cached image // use cached image
logging.log(rid + "userId cached & recently updated"); logging.log(rid + "userId cached & recently updated");
callback(null, (cached_hash ? 1 : 0), cached_hash); callback(null, (cached_hash ? 1 : 0), cached_hash);