X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hp=1a9ad80ceb7298d0c7e341ccddce680b1a80870d;hb=04b3139e734606e5281f7a784c3a04ce1b02cc4d;hpb=3dce1ecbdc99e7afbcb0338e585b4e587e0c6cd2

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 1a9ad80..566ad10 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -63,9 +63,21 @@ events.addEventListener("game-state", event => {
 
   window.game.set_active_prompt(state.active_prompt);
 
-  window.game.set_scores(state.scores);
+  window.game.set_players_answered(state.players_answered);
+
+  window.game.set_players_answering(state.players_answering);
+
+  window.game.set_end_answers(state.end_answers);
 
   window.game.set_ambiguities(state.ambiguities);
+
+  window.game.set_players_judged(state.players_judged);
+
+  window.game.set_players_judging(state.players_judging);
+
+  window.game.set_end_judging(state.end_judging);
+
+  window.game.set_scores(state.scores);
 });
 
 events.addEventListener("prompt", event => {
@@ -349,10 +361,6 @@ const PromptOptions = React.memo(props => {
 
 const LetsPlay = React.memo(props => {
 
-  function handle_click(prompt_id) {
-    fetch_post_json
-  }
-
   const quorum = Math.round((props.num_players + 1) / 2);
   const max_votes = props.prompts.reduce(
     (max_so_far, v) => Math.max(max_so_far, v.votes.length), 0);
@@ -397,11 +405,13 @@ class Ambiguities extends React.PureComponent {
       submitted: false,
       selected: null
     };
+
+    this.judging_sent_recently = false;
   }
 
   async handle_submit() {
     const response = await fetch_post_json(
-      `judging/${this.props.prompt.id}`,{
+      `judged/${this.props.prompt.id}`,{
         word_groups: this.state.word_sets.map(set => Array.from(set))
       }
     );
@@ -413,7 +423,7 @@ class Ambiguities extends React.PureComponent {
         return;
       }
     } else {
-      add_message("danger", "An error occurred submitting your answers");
+      add_message("danger", "An error occurred submitting the results of your judging");
       return;
     }
 
@@ -423,12 +433,30 @@ class Ambiguities extends React.PureComponent {
   }
 
   handle_click(word) {
+
+    /* Let the server know we are doing some judging, (but rate limit
+     * this so we don't send a "judging" notification more frquently
+     * than necessary.
+     */
+    if (! this.judging_sent_recently) {
+      fetch_post_json(`judging/${this.props.prompt.id}`);
+      this.judging_sent_recently = true;
+      setTimeout(() => { this.judging_sent_recently = false; }, 1000);
+    }
+
     if (this.state.selected == word) {
       /* Second click on same word removes the word from the group. */
       const idx = this.state.word_sets.findIndex(s => s.has(word));
       const set = this.state.word_sets[idx];
-      if (set.size === 1)
+      if (set.size === 1) {
+        /* When the word is already alone, there's nothing to do but
+         * to un-select it. */
+        this.setState({
+          selected: null
+        });
         return;
+      }
+
       const new_set = new Set([...set].filter(w => w !== word));
       this.setState({
         selected: null,
@@ -482,7 +510,7 @@ class Ambiguities extends React.PureComponent {
             Still waiting for the following players:
           </p>
           <ul>
-            {Object.entries(this.props.players_judging).map(player => {
+            {Object.keys(this.props.players_judging).map(player => {
               return (
                 <li
                   key={player}
@@ -573,7 +601,27 @@ class ActivePrompt extends React.PureComponent {
     };
 
     this.answers = [...Array(items)].map(() => React.createRef());
+    this.answering_sent_recently = false;
+
     this.handle_submit = this.handle_submit.bind(this);
+    this.handle_change = this.handle_change.bind(this);
+  }
+
+  handle_change(event) {
+    /* We don't care (or even look) at what the player is typing at
+     * this point. We simply want to be informed that the player _is_
+     * typing so that we can tell the server (which will tell other
+     * players) that there is activity here.
+     */
+
+    /* Rate limit so that we don't send an "answering" notification
+     * more frequently than necessary.
+     */
+    if (! this.answering_sent_recently) {
+      fetch_post_json(`answering/${this.props.prompt.id}`);
+      this.answering_sent_recently = true;
+      setTimeout(() => { this.answering_sent_recently = false; }, 1000);
+    }
   }
 
   async handle_submit(event) {
@@ -616,7 +664,7 @@ class ActivePrompt extends React.PureComponent {
           Still waiting for the following players:
           </p>
           <ul>
-            {Object.entries(this.props.players_answering).map(player => {
+            {Object.keys(this.props.players_answering).map(player => {
               return (
                 <li
                   key={player}
@@ -670,6 +718,7 @@ class ActivePrompt extends React.PureComponent {
                   name={`answer_${i}`}
                   required
                   autoComplete="off"
+                  onChange={this.handle_change}
                   ref={this.answers[i]}
                 />
               </div>
@@ -775,6 +824,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_players_answered(players) {
+    this.setState({
+      players_answered: new Set(players)
+    });
+  }
+
   set_player_answered(player) {
     const new_players_answering = {...this.state.players_answering};
     delete new_players_answering[player];
@@ -785,6 +840,16 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_players_answering(players) {
+    const players_answering = {};
+    for (let player of players) {
+      players_answering[player] = {active: false};
+    }
+    this.setState({
+      players_answering: players_answering
+    });
+  }
+
   set_player_answering(player) {
     this.setState({
       players_answering: {
@@ -794,6 +859,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_end_answers(players) {
+    this.setState({
+      end_answers_votes: new Set(players)
+    });
+  }
+
   set_player_vote_end_answers(player) {
     this.setState({
       end_answers_votes: new Set([...this.state.end_answers_votes, player])
@@ -812,6 +883,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_players_judged(players) {
+    this.setState({
+      players_judged: new Set(players)
+    });
+  }
+
   set_player_judged(player) {
     const new_players_judging = {...this.state.players_judging};
     delete new_players_judging[player];
@@ -822,6 +899,16 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_players_judging(players) {
+    const players_judging = {};
+    for (let player of players) {
+      players_judging[player] = {active: false};
+    }
+    this.setState({
+      players_judging: players_judging
+    });
+  }
+
   set_player_judging(player) {
     this.setState({
       players_judging: {
@@ -831,6 +918,11 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_end_judging(players) {
+    this.setState({
+      end_judging_votes: new Set(players)
+    });
+  }
 
   set_player_vote_end_judging(player) {
     this.setState({