diff --git a/api/routes/awardings.js b/api/routes/awardings.js index 9776d3e..574b127 100644 --- a/api/routes/awardings.js +++ b/api/routes/awardings.js @@ -17,13 +17,7 @@ const AwardingModel = require('../models/awarding'); // result set for proposer(appUser) population const resultSet = { - '__v': 0, - 'updatedAt': 0, - 'timestamp': 0, - 'password': 0, - 'permission': 0, - 'secret': 0, - 'activated': 0, + '__v': 0, 'updatedAt': 0, 'timestamp': 0, 'password': 0, 'permission': 0, 'secret': 0, 'activated': 0, }; const awarding = express.Router(); @@ -56,28 +50,29 @@ awarding.route('/') }); } else { AwardingModel.find(filter, {}, {sort: {date: 'desc'}}) - .populate('decorationId').populate('proposer', resultSet).populate('userId').exec((err, items) => { - if (err) { - err.status = codes.servererror; - return next(err); - // with return before (or after) the next(err) we prevent that the code continues here after next(err) - // has finished. this saves an extra else {..} - } - let results = []; - if (req.query.fractFilter) { - for (let item of items) { - if (item.decorationId.fraction === req.query.fractFilter) { - results.push(item); - } - } - res.locals.items = results; - } else { - res.locals.items = items; - } + .populate('decorationId').populate('proposer', resultSet).populate('userId') + .exec((err, items) => { + if (err) { + err.status = codes.servererror; + return next(err); + // with return before (or after) the next(err) we prevent that the code continues here + // after next(err) has finished. this saves an extra else {..} + } + let results = []; + if (req.query.fractFilter) { + for (let item of items) { + if (item.decorationId.fraction === req.query.fractFilter) { + results.push(item); + } + } + res.locals.items = results; + } else { + res.locals.items = items; + } - res.locals.processed = true; - next(); - }); + res.locals.processed = true; + next(); + }); } }) @@ -98,9 +93,7 @@ awarding.route('/') }); }) - .all( - routerHandling.httpMethodNotAllowed - ); + .all(routerHandling.httpMethodNotAllowed); awarding.route('/:id') @@ -146,9 +139,7 @@ awarding.route('/:id') }); }) - .all( - routerHandling.httpMethodNotAllowed - ); + .all(routerHandling.httpMethodNotAllowed); // this middleware function can be used, if you like or remove it // it looks for object(s) in res.locals.items and if they exist, they are send to the client as json diff --git a/api/routes/decorations.js b/api/routes/decorations.js index 951b118..61c41bb 100644 --- a/api/routes/decorations.js +++ b/api/routes/decorations.js @@ -67,7 +67,8 @@ decoration.route('/') } res.status(codes.created); res.locals.items = decoration; - fs.appendFile(__dirname + '/../resource/decoration/' + decoration.id + '.png', new Buffer(req.file.buffer), + fs.appendFile(__dirname + '/../resource/decoration/' + decoration.id + '.png', + new Buffer(req.file.buffer), (err) => { if (err) next(err); }); diff --git a/api/routes/players.js b/api/routes/players.js index 2feafdb..ed3dbdc 100644 --- a/api/routes/players.js +++ b/api/routes/players.js @@ -42,7 +42,8 @@ campaignPlayer.route('/ranking/:campaignId') new Set(items.map(usesUUID ? (x) => x.steamUUID : (x) => x.name)) .forEach((player) => { - const playerInstances = items.filter(usesUUID ? (p) => p.steamUUID === player : (p) => p.name === player); + const playerInstances = items.filter( + usesUUID ? (p) => p.steamUUID === player : (p) => p.name === player); const resItem = { name: usesUUID ? playerInstances[playerInstances.length - 1].name : player, kill: 0, diff --git a/api/test/content-tool/user-db-item-creator.js b/api/test/content-tool/user-db-item-creator.js index d5843a8..27035a1 100644 --- a/api/test/content-tool/user-db-item-creator.js +++ b/api/test/content-tool/user-db-item-creator.js @@ -23,8 +23,8 @@ const createString = (possible, length) => { let text = ''; for (let i = 0; i < length; i++) { -text += possible.charAt(Math.floor(Math.random() * possible.length)); -} + text += possible.charAt(Math.floor(Math.random() * possible.length)); + } return text; }; diff --git a/api/tools/log-parse-tool.js b/api/tools/log-parse-tool.js index 02ba1ff..22c6a90 100644 --- a/api/tools/log-parse-tool.js +++ b/api/tools/log-parse-tool.js @@ -206,8 +206,10 @@ const parseWarLog = (lineArray, war) => { const playerName = stats.players[i].name; stats.players[i]['respawn'] = stats.respawn.filter((res) => res.player === playerName).length; stats.players[i]['kill'] = stats.kills.filter((kill) => kill.shooter === playerName && !kill.friendlyFire).length; - stats.players[i]['vehicle'] = stats.vehicles.filter((vehicle) => vehicle.shooter === playerName && vehicleBlacklist.indexOf(vehicle.target) < 0).length; - stats.players[i]['friendlyFire'] = stats.kills.filter((kill) => kill.shooter === playerName && kill.friendlyFire).length; + stats.players[i]['vehicle'] = stats.vehicles.filter( + (vehicle) => vehicle.shooter === playerName && vehicleBlacklist.indexOf(vehicle.target) < 0).length; + stats.players[i]['friendlyFire'] = stats.kills.filter( + (kill) => kill.shooter === playerName && kill.friendlyFire).length; stats.players[i]['death'] = stats.kills.filter((kill) => kill.target === playerName).length; stats.players[i]['revive'] = stats.revive.filter((rev) => rev.medic === playerName && !rev.stabilized).length; stats.players[i]['flagTouch'] = stats.flag.filter((flag) => flag.player === playerName).length; diff --git a/api/tools/signature-tool.js b/api/tools/signature-tool.js index 9cdbf5f..056cdc6 100644 --- a/api/tools/signature-tool.js +++ b/api/tools/signature-tool.js @@ -179,29 +179,30 @@ let addDecorationsAndSave = (userId, loadedImage, res, next) => { // use synchronized call to keep correct order of decorations async.eachSeries(awardings, (award, callback) => { - jimp.read(resourceDir + 'decoration/' + award.decorationId._id + fileExt).then((decorationImage) => { - if (award.decorationId.isMedal) { - decorationImage.resize(medalW, medalH); - loadedImage.composite(decorationImage, medalPx, medalPy); - if (medalPy === 5) { - medalPx = medalPx - 1 - medalW; - } else { - medalPx = medalPx + 1 + medalW; - } - if (medalPx <= 300) { - medalPy = medalPy + 3 + medalH; - } - } else { - decorationImage.resize(ribbonW, ribbonH); - loadedImage.composite(decorationImage, ribbonPx, ribbonPy); - ribbonPx = ribbonPx - 2 - ribbonW; - if (ribbonPx <= 154) { - ribbonPy = ribbonPy - 3 - ribbonH; - ribbonPx = 598; - } - } - callback(); - }); + jimp.read(resourceDir + 'decoration/' + award.decorationId._id + fileExt) + .then((decorationImage) => { + if (award.decorationId.isMedal) { + decorationImage.resize(medalW, medalH); + loadedImage.composite(decorationImage, medalPx, medalPy); + if (medalPy === 5) { + medalPx = medalPx - 1 - medalW; + } else { + medalPx = medalPx + 1 + medalW; + } + if (medalPx <= 300) { + medalPy = medalPy + 3 + medalH; + } + } else { + decorationImage.resize(ribbonW, ribbonH); + loadedImage.composite(decorationImage, ribbonPx, ribbonPy); + ribbonPx = ribbonPx - 2 - ribbonW; + if (ribbonPx <= 154) { + ribbonPy = ribbonPy - 3 - ribbonH; + ribbonPx = 598; + } + } + callback(); + }); }, (err) => { if (err) { throw err;