X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy.js;h=79a0c441218a33b6b3b9219b12ca3d67d18fc8cf;hb=6dcdee137ccf391989a1c83f1e7df6b4f71631e2;hp=25d8f77b975e86280a66c393c2587ed9c5c86941;hpb=325a886a5d84c42c67e7075c734b74619d383ea2;p=lmno-server

diff --git a/empathy.js b/empathy.js
index 25d8f77..79a0c44 100644
--- a/empathy.js
+++ b/empathy.js
@@ -9,12 +9,18 @@ class Empathy extends Game {
     this.state = {
       prompts: [],
       active_prompt: null,
-      players_answered: 0,
+      players_answered: [],
+      players_answering: new Set(),
+      answering_idle: false,
+      end_answers: new Set(),
       ambiguities: null,
-      players_judged: 0,
+      players_judged: [],
+      players_judging: new Set(),
+      end_judging: new Set(),
       scores: null
     };
     this.answers = [];
+    this.answering_idle_timer = 0;
     this.next_prompt_id = 1;
     this.equivalencies = {};
   }
@@ -45,9 +51,14 @@ class Empathy extends Game {
       );
 
     this.state.active_prompt = null;
-    this.state.players_answered = 0;
+    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 = 0;
+    this.state.players_judged = [];
+    this.state.players_judging = new Set();
+    this.state.end_judging = new Set();
     this.state.scores = null;
 
     this.answers = [];
@@ -127,13 +138,64 @@ class Empathy extends Game {
       answers: answers
     });
 
-    /* And notify players how many players have answered. */
-    this.state.players_answered++;
-    this.broadcast_event_object('answered', this.state.players_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 };
   }
 
+  receive_answering(prompt_id, session_id) {
+    const player = this.players_by_session[session_id];
+    if (! player)
+      return { valid: false, message: "Player not found" };
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt)
+      return { valid: false, message: "Prompt not found" };
+
+    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);
+      }, 30 * 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);
+
+    return { valid: true };
+  }
+
+  /* Returns true if vote toggled, false for player or prompt not found */
+  toggle_end_answers(prompt_id, session_id) {
+    const player = this.players_by_session[session_id];
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt || ! player)
+      return false;
+
+    if (this.state.end_answers.has(player.name)) {
+      this.state.end_answers.delete(player.name);
+      this.broadcast_event_object('unvote-end-answers', player.name);
+    } else {
+      this.state.end_answers.add(player.name);
+      this.broadcast_event_object('vote-end-answers', player.name);
+    }
+
+    return true;
+  }
+
   perform_judging() {
     const word_map = {};
 
@@ -144,12 +206,14 @@ class Empathy extends Game {
       }
     }
 
-    this.state.ambiguities = Object.values(word_map);
+    this.state.ambiguities = Object.values(word_map).sort((a,b) => {
+      return a.toLowerCase().localeCompare(b.toLowerCase());
+    });
 
     this.broadcast_event_object('ambiguities', this.state.ambiguities);
   }
 
-  receive_judging(prompt_id, session_id, word_groups) {
+  receive_judged(prompt_id, session_id, word_groups) {
     const player = this.players_by_session[session_id];
     if (! player)
       return { valid: false, message: "Player not found" };
@@ -180,11 +244,13 @@ class Empathy extends Game {
             eq = [group[j], group[i]];
           }
 
-          const exist = this.equivalencies[`${eq[0]}:${eq[1]}`];
+          const key=`${this.canonize(eq[0])}:${this.canonize(eq[1])}`;
+
+          const exist = this.equivalencies[key];
           if (exist) {
             exist.count++;
           } else {
-            this.equivalencies[`${eq[0]}:${eq[1]}`] = {
+            this.equivalencies[key] = {
               count: 1,
               words: eq
             };
@@ -194,13 +260,54 @@ class Empathy extends Game {
       }
     }
 
-    /* And notify players how many players have completed judging. */
-    this.state.players_judged++;
-    this.broadcast_event_object('judged', this.state.players_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 };
+  }
+
+  receive_judging(prompt_id, session_id) {
+    const player = this.players_by_session[session_id];
+    if (! player)
+      return { valid: false, message: "Player not found" };
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt)
+      return { valid: false, message: "Prompt not found" };
+
+    if (prompt !== this.state.active_prompt)
+      return { valid: false, message: "Prompt no longer active" };
+
+    /* Notify all players this this player is actively judging. */
+    this.state.players_judging.add(player.name);
+    this.broadcast_event_object('player-judging', player.name);
 
     return { valid: true };
   }
 
+  /* Returns true if vote toggled, false for player or prompt not found */
+  toggle_end_judging(prompt_id, session_id) {
+    const player = this.players_by_session[session_id];
+
+    const prompt = this.state.prompts.find(p => p.id === prompt_id);
+    if (! prompt || ! player)
+      return false;
+
+    if (this.state.end_judging.has(player.name)) {
+      this.state.end_judging.delete(player.name);
+      this.broadcast_event_object('unvote-end-judging', player.name);
+    } else {
+      this.state.end_judging.add(player.name);
+      this.broadcast_event_object('vote-end-judging', player.name);
+    }
+
+    return true;
+  }
+
   canonize(word) {
     return word.toLowerCase();
   }
@@ -219,19 +326,21 @@ class Empathy extends Game {
     const word_maps = {};
 
     for (let e of agreed_equivalencies) {
-      let group = word_maps[e.words[0]];
+      const word0_canon = this.canonize(e.words[0]);
+      const word1_canon = this.canonize(e.words[1]);
+      let group = word_maps[word0_canon];
       if (! group)
-        group = word_maps[e.words[1]];
+        group = word_maps[word1_canon];
       if (! group)
         group = { words: [], players: new Set()};
 
-      if (! word_maps[e.words[0]]) {
-        word_maps[e.words[0]] = group;
+      if (! word_maps[word0_canon]) {
+        word_maps[word0_canon] = group;
         group.words.push(e.words[0]);
       }
 
-      if (! word_maps[e.words[1]]) {
-        word_maps[e.words[1]] = group;
+      if (! word_maps[word1_canon]) {
+        word_maps[word1_canon] = group;
         group.words.push(e.words[1]);
       }
     }
@@ -240,13 +349,14 @@ class Empathy extends Game {
      * to the set corresponding to each word group. */
     for (let a of this.answers) {
       for (let word of a.answers) {
+        const word_canon = this.canonize(word);
         /* If there's no group yet, this is a singleton word. */
-        if (word_maps[word]) {
-          word_maps[word].players.add(a.player);
+        if (word_maps[word_canon]) {
+          word_maps[word_canon].players.add(a.player);
         } else {
           const group = { words: [word], players: new Set() };
           group.players.add(a.player);
-          word_maps[word] = group;
+          word_maps[word_canon] = group;
         }
       }
     }
@@ -261,7 +371,8 @@ class Empathy extends Game {
      * multiple times). In contrast, iterating over"word_groups" will
      * have you visit each group only once. */
     const word_groups = Object.entries(word_maps).filter(
-      entry => entry[0] === entry[1].words[0]).map(entry => entry[1]);
+      entry => entry[0] === this.canonize(entry[1].words[0]))
+          .map(entry => entry[1]);
 
     /* Now, go through each word group and assign the scores out to
      * the corresponding players.
@@ -370,21 +481,59 @@ router.post('/answer/:prompt_id([0-9]+)', (request, response) => {
                                      request.session.id,
                                      request.body.answers);
   response.json(result);
+});
+
+router.post('/answering/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  const result = game.receive_answering(prompt_id,
+                                        request.session.id);
+  response.json(result);
+});
 
-  if (game.state.players_answered >= game.players.length)
+router.post('/end-answers/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  if (game.toggle_end_answers(prompt_id, request.session.id))
+    response.send('');
+  else
+    response.sendStatus(404);
+
+  if (game.state.end_answers.size > (game.state.players_answered.length / 2))
     game.perform_judging();
 });
 
+router.post('/judged/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  const result = game.receive_judged(prompt_id,
+                                     request.session.id,
+                                     request.body.word_groups);
+  response.json(result);
+});
+
 router.post('/judging/:prompt_id([0-9]+)', (request, response) => {
   const game = request.game;
   const prompt_id = parseInt(request.params.prompt_id, 10);
 
   const result = game.receive_judging(prompt_id,
-                                      request.session.id,
-                                      request.body.word_groups);
+                                      request.session.id);
   response.json(result);
+});
+
+router.post('/end-judging/:prompt_id([0-9]+)', (request, response) => {
+  const game = request.game;
+  const prompt_id = parseInt(request.params.prompt_id, 10);
+
+  if (game.toggle_end_judging(prompt_id, request.session.id))
+    response.send('');
+  else
+    response.sendStatus(404);
 
-  if (game.state.players_judged >= game.players.length)
+  if (game.state.end_judging.size > (game.state.players_answered.length / 2))
     game.compute_scores();
 });