Merge branch 'master' of github.com:Jake0oo0/crafatar

This commit is contained in:
jomo 2014-11-29 21:25:19 +01:00
commit 4f610861e9
2 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@ var router = express.Router();
router.get('/', function(req, res) { router.get('/', function(req, res) {
res.render('index', { res.render('index', {
title: 'Crafatar', title: 'Crafatar',
domain: "https://" + req.headers.host, domain: req.secure ? "https" : "http" + "://" + req.headers.host,
config: config config: config
}); });
}); });

View File

@ -14,8 +14,8 @@ config.http_timeout *= 3;
// no spam // no spam
logging.log = function(){}; logging.log = function(){};
var uuids = fs.readFileSync('test/uuids.txt').toString().split("\n"); var uuids = fs.readFileSync('test/uuids.txt').toString().split("\r\n");
var usernames = fs.readFileSync('test/usernames.txt').toString().split("\n"); var usernames = fs.readFileSync('test/usernames.txt').toString().split("\r\n");
// Get a random UUID + username in order to prevent rate limiting // Get a random UUID + username in order to prevent rate limiting
var uuid = uuids[Math.round(Math.random() * (uuids.length - 1))]; var uuid = uuids[Math.round(Math.random() * (uuids.length - 1))];
console.log("using uuid '" + uuid + "'"); console.log("using uuid '" + uuid + "'");