empathy: Alphabetize list before sending it out for judging

[lmno-server] / empathy.js

diff --git a/empathy.js b/empathy.js
index 25d8f77b975e86280a66c393c2587ed9c5c86941..759b486f8b58b1814299c1fe6863bb17109b2917 100644 (file)
--- a/empathy.js
+++ b/empathy.js
@@ -144,7 +144,9 @@ 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);
   }
@@ -219,19 +221,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 +244,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;
         }
       }
     }