Code cleanup for helpers.js

This commit is contained in:
Alex Corn 2019-09-24 04:41:11 -04:00
parent d7cfc396a7
commit 30ebf333b4

View File

@ -1,35 +1,32 @@
const EResult = require('../resources/EResult.js'); const EResult = require('../resources/EResult.js');
exports.isSteamID = function(input) { exports.isSteamID = function(input) {
var keys = Object.keys(input); let keys = Object.keys(input);
if (keys.length != 4) { if (keys.length != 4) {
return false; return false;
} }
// Make sure it has the keys we expect // Make sure it has the keys we expect
keys = keys.filter(function(item) { keys.sort();
return ['universe', 'type', 'instance', 'accountid'].indexOf(item) != -1; return keys.join(',') == 'accountid,instance,type,universe';
});
return keys.length == 4;
}; };
exports.decodeSteamTime = function(time) { exports.decodeSteamTime = function(time) {
var date = new Date(); let date = new Date();
if (time.includes("@")) { if (time.includes('@')) {
var parts = time.split('@'); let parts = time.split('@');
if (!parts[0].includes(",")) { if (!parts[0].includes(',')) {
// no year, assume current year // no year, assume current year
parts[0] += ", " + date.getFullYear(); parts[0] += ', ' + date.getFullYear();
} }
date = new Date(parts.join('@').replace(/(am|pm)/, ' $1') + " UTC"); // add a space so JS can decode it date = new Date(parts.join('@').replace(/(am|pm)/, ' $1') + ' UTC'); // add a space so JS can decode it
} else { } else {
// Relative date // Relative date
var amount = time.replace(/(\d) (minutes|hour|hours) ago/, "$1"); let amount = time.replace(/(\d) (minutes|hour|hours) ago/, '$1');
if(time.includes("minutes")) { if (time.includes('minutes')) {
date.setMinutes(date.getMinutes() - amount); date.setMinutes(date.getMinutes() - amount);
} else if (time.match(/hour|hours/)) { } else if (time.match(/hour|hours/)) {
date.setHours(date.getHours() - amount); date.setHours(date.getHours() - amount);
@ -50,7 +47,7 @@ exports.eresultError = function(eresult) {
return null; return null;
} }
var err = new Error(EResult[eresult] || ("Error " + eresult)); let err = new Error(EResult[eresult] || ("Error " + eresult));
err.eresult = eresult; err.eresult = eresult;
return err; return err;
}; };