X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=8a3210e5229c14cd750d5bbd4408c2536eab6c59;hb=c60da21a61ee8b98550618aa197aefb3cf69a725;hp=abb1f2057c2582aad12d87e05ac732113583e0bb;hpb=a5dd0c5e612311132f053b71f32a1fe94e5819d3;p=empires-server diff --git a/lmno.js b/lmno.js index abb1f20..8a3210e 100644 --- a/lmno.js +++ b/lmno.js @@ -142,10 +142,16 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) => const game_id = request.params.game_id; const canon_id = lmno_canonize(game_id); - /* Redirect user to page with the canonical ID in it. */ - if (game_id !== canon_id) { - const new_url = request.originalUrl.replace(`/${engine}/${game_id}`, - `/${engine}/${canon_id}`); + /* Redirect user to page with the canonical ID in it, also ensuring + * that the game ID is _always_ followed by a slash. */ + const has_slash = new RegExp(`^/${engine}/${game_id}/`); + if (game_id !== canon_id || + ! has_slash.test(request.originalUrl)) + { + const old_path = new RegExp(`/${engine}/${game_id}/?`); + const new_path = `/${engine}/${canon_id}/`; + const new_url = request.originalUrl.replace(old_path, new_path); + console.log("Redirecting from " + request.originalUrl + " to " + new_url); response.redirect(301, new_url); return; }