IcyNetwork/IcyNet.eu
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

forgot to include this file lol

Browse Source
This commit is contained in:
Evert Prants 2017-11-18 11:01:14 +02:00
parent b5d1a417de
commit dd32345453
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/routes/api.js
View File

@ -60,6 +60,20 @@ function createSession (req, user) {
} }
} }
// Get either `uuid` or `id` from `:id` parameter
function idParam (req) {
let id = req.params.id
if (id.length === 36 && id.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i)) {
return id
}
if (!isNaN(parseInt(id))) {
return parseInt(id)
}
return null
}
// Either give JSON or make a redirect // Either give JSON or make a redirect
function JsonData (req, res, error, redirect = '/') { function JsonData (req, res, error, redirect = '/') {
res.jsonp({error: error, redirect: redirect}) res.jsonp({error: error, redirect: redirect})
@ -429,8 +443,8 @@ router.get('/avatar', wrap(async (req, res, next) => {
// Get latest avatar of user by id // Get latest avatar of user by id
router.get('/avatar/:id', wrap(async (req, res, next) => { router.get('/avatar/:id', wrap(async (req, res, next) => {
let id = parseInt(req.params.id) let id = idParam(req)
if (isNaN(id)) return next() if (!id) return next()
let user = await API.User.get(id) let user = await API.User.get(id)