Drop a gratuitous anonymous object for storing an array of games

Recent commits have trimmed down this object until it has a single
property, so we can drop the object and store the value of that
property directly.

This makes a bunch of code much easier to read by replacing all
occurences of "game.game" with just "game". The old code was really
confusing because it was so unclear what the top-level game container
even was.

diff --git a/lmno.js b/lmno.js
index 5f5b2c7248db82fbd289002033bbd4c8cc24b05b..5d7d5687522a214c7c8a82633d74c8930eee45b2 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -70,9 +70,7 @@ class LMNO {
 
     const game = new engine.Game(id);
 
-    this.games[id] = {
-      game: game
-    };
+    this.games[id] = game;
 
     return id;
   }
@@ -135,7 +133,7 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
       response.sendStatus(404);
       return;
   }
-  response.redirect(301, `/${game.game.meta.identifier}/${game.game.id}/`);
+  response.redirect(301, `/${game.meta.identifier}/${game.id}/`);
 });
 
 /* LMNO middleware to lookup the game. */
@@ -165,7 +163,7 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
   }
 
   /* Stash the game onto the request to be used by the game-specific code. */
-  request.game = game.game;
+  request.game = game;
   next();
 });
 
@@ -237,7 +235,7 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].game.clients.length)
+    if (lmno.games[id].clients.length)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);

diff --git a/templates/admin.html b/templates/admin.html
index 4db60ce68615c905d2b8b20eea31488176e69a0f..39939b2f4b1c8fb3402632f3cdfa5b856377961c 100644 (file)
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -12,8 +12,8 @@
 <ul>
   {% for game in games.active %}
   <li>
-    {{ game.game.id }} ({{ game.game.clients.length }}/{{ game.game._players.length }} active)
-    {% for player in game.game._players %}
+    {{ game.id }} ({{ game.clients.length }}/{{ game._players.length }} active)
+    {% for player in game._players %}
       {{ player.name }}
     {% endfor %}
   </li>
@@ -27,8 +27,8 @@
 <ul>
   {% for game in games.idle %}
   <li>
-    {{ game.game.id }} ({{ game.game._players.length }})
-    {% for player in game.game._players %}
+    {{ game.id }} ({{ game._players.length }})
+    {% for player in game._players %}
       {{ player.name }}
     {% endfor %}
   </li>