X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy.js;h=04b4c6d4bd3f33bb6ce62817af9088843b554c64;hb=494088c527c26d19391bdab65048ef39b2d590f0;hp=ae400a6009709deceef876caa71343a1957a4d1a;hpb=9008208ecebde544671e9c42f1d15fc9fc834f91;p=lmno-server

diff --git a/empathy.js b/empathy.js
index ae400a6..04b4c6d 100644
--- a/empathy.js
+++ b/empathy.js
@@ -11,6 +11,7 @@ class Empathy extends Game {
       active_prompt: null,
       players_answered: [],
       players_answering: new Set(),
+      answering_idle: false,
       end_answers: new Set(),
       ambiguities: null,
       players_judged: [],
@@ -19,6 +20,7 @@ class Empathy extends Game {
       scores: null
     };
     this.answers = [];
+    this.answering_idle_timer = 0;
     this.next_prompt_id = 1;
     this.equivalencies = {};
   }
@@ -51,6 +53,7 @@ class Empathy extends Game {
     this.state.active_prompt = null;
     this.state.players_answered = [];
     this.state.players_answering = new Set();
+    this.state.answering_idle = false;
     this.state.end_answers = new Set();
     this.state.ambiguities = 0;
     this.state.players_judged = [];
@@ -135,8 +138,11 @@ class Empathy extends Game {
       answers: answers
     });
 
-    /* And notify all players that this player has answered. */
+    /* Update state (to be sent out to any future clients) */
+    this.state.players_answering.delete(player.name);
     this.state.players_answered.push(player.name);
+
+    /* And notify all players that this player has answered. */
     this.broadcast_event_object('player-answered', player.name);
 
     return { valid: true };
@@ -154,6 +160,16 @@ class Empathy extends Game {
     if (prompt !== this.state.active_prompt)
       return { valid: false, message: "Prompt no longer active" };
 
+    if (this.answering_idle_timer) {
+      clearTimeout(this.answering_idle_timer);
+    }
+    if (! this.state.answering_idle) {
+      this.answering_idle_timer = setTimeout(() => {
+        this.state_answering_idle = true;
+        this.broadcast_event_object('answering-idle', true);
+      }, 10 * 1000);
+    }
+
     /* Notify all players that this player is actively answering. */
     this.state.players_answering.add(player.name);
     this.broadcast_event_object('player-answering', player.name);
@@ -244,8 +260,11 @@ class Empathy extends Game {
       }
     }
 
-    /* And notify all players this this player has judged. */
+    /* Update state (to be sent out to any future clients) */
+    this.state.players_judging.delete(player.name);
     this.state.players_judged.push(player.name);
+
+    /* And notify all players this this player has judged. */
     this.broadcast_event_object('player-judged', player.name);
 
     return { valid: true };
@@ -290,7 +309,7 @@ class Empathy extends Game {
   }
 
   canonize(word) {
-    return word.toLowerCase();
+    return word.trim().toLowerCase();
   }
 
   compute_scores() {
@@ -514,7 +533,7 @@ router.post('/end-judging/:prompt_id([0-9]+)', (request, response) => {
   else
     response.sendStatus(404);
 
-  if (game.state.end_judging.size > (game.state.players_judged.length / 2))
+  if (game.state.end_judging.size > (game.state.players_answered.length / 2))
     game.compute_scores();
 });