azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-05-06 11:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Namespace and move config to root directory, closes #124

Browse Source
This commit is contained in:
Jake
2015-06-25 13:12:08 -05:00
parent 2eb1112c3b
commit a2e0edc491
16 changed files with 210 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/routes/avatars.js
View File

@@ -1,6 +1,6 @@
var logging = require("../logging");
var helpers = require("../helpers");
var config = require("../config");
var config = require("../../config");
var skins = require("../skins");
var cache = require("../cache");
var path = require("path");
@@ -45,7 +45,7 @@ function handle_default(img_status, userId, size, def, req, err, callback) {
// GET avatar request
module.exports = function(req, callback) {
var userId = (req.url.path_list[1] || "").split(".")[0];
var size = parseInt(req.url.query.size) || config.default_size;
var size = parseInt(req.url.query.size) || config.avatars.default_size;
var def = req.url.query.default;
var helm = req.url.query.hasOwnProperty("helm");
@@ -59,7 +59,7 @@ module.exports = function(req, callback) {
}
// Prevent app from crashing/freezing
if (size < config.min_size || size > config.max_size) {
if (size < config.avatars.min_size || size > config.avatars.max_size) {
// "Unprocessable Entity", valid request, but semantically erroneous:
// https://tools.ietf.org/html/rfc4918#page-78
callback({

2
lib/routes/index.js
View File

@@ -1,4 +1,4 @@
var config = require("../config");
var config = require("../../config");
var path = require("path");
var jade = require("jade");

8
lib/routes/renders.js
View File

@@ -1,7 +1,7 @@
var logging = require("../logging");
var helpers = require("../helpers");
var renders = require("../renders");
var config = require("../config");
var config = require("../../config");
var cache = require("../cache");
var skins = require("../skins");
var path = require("path");
@@ -9,8 +9,6 @@ var fs = require("fs");
// valid types: head, body
// helmet is query param
// TODO: The Type logic should be two separate GET functions once response methods are extracted
function handle_default(rid, scale, helm, body, img_status, userId, size, def, req, err, callback) {
def = def || skins.default_skin(userId);
if (def !== "steve" && def !== "alex") {
@@ -57,7 +55,7 @@ module.exports = function(req, callback) {
var body = raw_type === "body";
var userId = (req.url.path_list[2] || "").split(".")[0];
var def = req.url.query.default;
var scale = parseInt(req.url.query.scale) || config.default_scale;
var scale = parseInt(req.url.query.scale) || config.renders.default_scale;
var helm = req.url.query.hasOwnProperty("helm");
// check for extra paths
@@ -78,7 +76,7 @@ module.exports = function(req, callback) {
return;
}
if (scale < config.min_scale || scale > config.max_scale) {
if (scale < config.renders.min_scale || scale > config.renders.max_scale) {
callback({
status: -2,
body: "Invalid Scale"