diff --git a/modules/helpers.js b/modules/helpers.js index a52edc1..6d6ab47 100644 --- a/modules/helpers.js +++ b/modules/helpers.js @@ -146,13 +146,16 @@ function store_images(rid, userId, details, type, callback) { currently_running.push(new_hash); networking.get_profile(rid, (is_uuid ? userId : null), function(err, profile) { if (err || (is_uuid && !profile)) { + // error or uuid without profile if (!err && !profile) { + // no error, but uuid without profile cache.save_hash(rid, userId, null, null, function(cache_err) { // we have no profile, so we have neither skin nor cape callback_for(userId, "skin", cache_err, null); callback_for(userId, "cape", cache_err, null); }); } else { + // an error occured, not caching callback_for(userId, type, err, null); } } else { diff --git a/modules/networking.js b/modules/networking.js index d4d9a72..1ec07e4 100644 --- a/modules/networking.js +++ b/modules/networking.js @@ -110,8 +110,8 @@ exp.get_uuid_url = function(profile, type, callback) { callback(url || null); }; -// make a request to sessionserver -// profile is returned as json +// make a request to sessionserver for +uuid+ +// +callback+ contains error, profile exp.get_profile = function(rid, uuid, callback) { if (!uuid) { callback(null, null); @@ -122,18 +122,16 @@ exp.get_profile = function(rid, uuid, callback) { } }; -// +userId+ is likely a username and if so -// +userId+ is used to get the url, otherwise -// +profile+ will be used to get the url +// get the skin URL for +userId+ +// +profile+ is used if +userId+ is a uuid exp.get_skin_url = function(rid, userId, profile, callback) { get_url(rid, userId, profile, 0, function(url) { callback(url); }); }; -// +userId+ is likely a username and if so -// +userId+ is used to get the url, otherwise -// +profile+ will be used to get the url +// get the cape URL for +userId+ +// +profile+ is used if +userId+ is a uuid exp.get_cape_url = function(rid, userId, profile, callback) { get_url(rid, userId, profile, 1, function(url) { callback(url);