Empathy: Eliminate delay when there's nobody to wait for

[lmno-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index b039a730c4004737c946dad9ae984c0b138c78b4..4b7b5a9d3b9ee1f25c921240790e7608a2d282bc 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -167,7 +167,7 @@ class Empathy extends Game {
       this.answering_idle_timer = setTimeout(() => {
         this.state_answering_idle = true;
         this.broadcast_event_object('answering-idle', true);
-      }, 30 * 1000);
+      }, 10 * 1000);
     }
 
     /* Notify all players that this player is actively answering. */
@@ -481,6 +481,11 @@ router.post('/answer/:prompt_id([0-9]+)', (request, response) => {
                                      request.session.id,
                                      request.body.answers);
   response.json(result);
+
+  /* If every registered player has answered, then there's no need to
+   * wait for anything else. */
+  if (game.state.players_answered.length >= game.players.length)
+    game.perform_judging();
 });
 
 router.post('/answering/:prompt_id([0-9]+)', (request, response) => {
@@ -513,6 +518,11 @@ router.post('/judged/:prompt_id([0-9]+)', (request, response) => {
                                      request.session.id,
                                      request.body.word_groups);
   response.json(result);
+
+  /* If every registered player has judged, then there's no need to
+   * wait for anything else. */
+  if (game.state.players_judged.length >= game.players.length)
+    game.compute_scores();
 });
 
 router.post('/judging/:prompt_id([0-9]+)', (request, response) => {