X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=71ccc58165298b3e313fa7f60e0422fb19e3b7b6;hb=2690233f317b87e7336b0404ae711837e726d5cf;hp=db0d35b9cc3a55fef821f1b1d2f75a5c9aee868d;hpb=9d73dc393cf84f6473304528f09e7b8696ed6510;p=empires-server

diff --git a/lmno.js b/lmno.js
index db0d35b..71ccc58 100644
--- a/lmno.js
+++ b/lmno.js
@@ -32,6 +32,15 @@ The "node lmno-passwd.js" command can help generate password hashes.`);
 }
 
 const app = express();
+
+/* This 'trust proxy' option, (and, really? a space in an option
+ * name?!)  means that express will grab hostname and IP values from
+ * the X-Forwarded-* header fields. We need that so that our games
+ * will display a proper hostname of https://lmno.games/WXYZ instead
+ * of http://localhost/QFBL which will obviously not be a helpful
+ * thing to share around.
+ */
+app.set('trust proxy', true);
 app.use(cors());
 app.use(body_parser.urlencoded({ extended: false }));
 app.use(body_parser.json());
@@ -81,7 +90,9 @@ nunjucks.configure("templates", {
  */
 const engines = {
   empires: require("./empires").Game,
-  tictactoe: require("./tictactoe").Game
+  tictactoe: require("./tictactoe").Game,
+  scribe: require("./scribe").Game,
+  empathy: require("./empathy").Game
 };
 
 class LMNO {
@@ -90,7 +101,11 @@ class LMNO {
   }
 
   generate_id() {
-    return Array(4).fill(null).map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
+    /* Note: The copy from Array(4) to [...Array(4)] is necessary so
+     * that map() will actually work, (which it doesn't on an array
+     * from Array(N) which is in this strange state of having "empty"
+     * items rather than "undefined" as we get after [...Array(4)] */
+    return [...Array(4)].map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
   }
 
   create_game(engine_name) {
@@ -285,10 +300,14 @@ for (let key in engines) {
   router.get('/', (request, response) => {
     const game = request.game;
 
-    if (! request.session.nickname)
-      response.render('choose-nickname.html', { game_name: game.meta.name });
-    else
+    if (! request.session.nickname) {
+      response.render('choose-nickname.html', {
+        game_name: game.meta.name,
+        options: game.meta.options
+      });
+    } else {
       response.render(`${game.meta.identifier}-game.html`);
+    }
   });
 
   router.put('/player', (request, response) => {