From: Benjamin Auder <benjamin.auder@somewhere>
Date: Tue, 4 Feb 2020 16:02:38 +0000 (+0100)
Subject: Some fixes
X-Git-Url: https://git.auder.net/variants/current/doc/css/R.css?a=commitdiff_plain;h=b1ea21493a31105d17cd600ff1d26ee6fd9e3f6f;p=vchess.git

Some fixes
---

diff --git a/client/src/components/Chat.vue b/client/src/components/Chat.vue
index d8513b31..65e0dcb0 100644
--- a/client/src/components/Chat.vue
+++ b/client/src/components/Chat.vue
@@ -51,7 +51,9 @@ export default {
     },
     sendChat: function() {
       let chatInput = document.getElementById("inputChat");
-      const chatTxt = chatInput.value;
+      const chatTxt = chatInput.value.trim();
+      if (chatTxt == "")
+        return; //nothing to send
       chatInput.value = "";
       const chat = {msg:chatTxt, name: this.st.user.name || "@nonymous"};
       this.$emit("newchat-sent", chat); //useful for corr games
diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 2e3509b0..7d4369be 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -227,7 +227,7 @@ export default {
           {
             // Minimal game informations:
             id: this.game.id,
-            players: this.game.players.map(p => { return {name:p.name}; }),
+            players: this.game.players,
             vid: this.game.vid,
             timeControl: this.game.timeControl,
           };
diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 7697e1b5..0ade5e58 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -131,8 +131,13 @@ export default {
     const chall = JSON.parse(localStorage.getItem("challenge") || "false");
     if (!!chall)
     {
-      if ((Date.now() - chall.added)/1000 <= 30*60)
+      // NOTE: a challenge survives 3 minutes, for potential connection issues
+      if ((Date.now() - chall.added)/1000 <= 3*60)
+      {
+        chall.added = Date.now(); //update added time, for next disconnect...
         this.challenges.push(chall);
+        localStorage.setItem("challenge", JSON.stringify(chall));
+      }
       else
         localStorage.removeItem("challenge");
     }
@@ -358,7 +363,11 @@ export default {
         {
           // Receive game from some player (+sid)
           // NOTE: it may be correspondance (if newgame while we are connected)
-          if (this.games.every(g => g.id != data.game.id)) //ignore duplicates
+          // If duplicate found: select rid (remote ID) at random
+          let game = this.games.find(g => g.id == data.game.id);
+          if (!!game && Math.random() < 0.5)
+            game.rid = data.from;
+          else
           {
             let newGame = data.game;
             newGame.type = this.classifyObject(data.game);
@@ -390,6 +399,7 @@ export default {
         case "refusechallenge":
         {
           ArrayFun.remove(this.challenges, c => c.id == data.cid);
+          localStorage.removeItem("challenge");
           alert(this.people[data.from].name + " declined your challenge");
           break;
         }
@@ -539,7 +549,14 @@ export default {
             code: "refusechallenge",
             cid: c.id, target: c.from.sid}));
         }
-        this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
+        // TODO: refactor the "sendSomethingTo()" function
+        if (!c.to)
+          this.sendSomethingTo(null, "deletechallenge", {cid:c.id});
+        else
+        {
+          this.st.conn.send(JSON.stringify({
+            code:"deletechallenge", target: c.from.sid, cid: c.id}));
+        }
       }
       else //my challenge
       {
@@ -587,6 +604,7 @@ export default {
       };
       if (c.type == "live")
       {
+        // NOTE: in this case we are sure opponent is online
         tryNotifyOpponent();
         this.startNewGame(gameInfo);
       }
@@ -604,14 +622,13 @@ export default {
         );
       }
       // Send game info to everyone except opponent (and me)
-      const playersNames = gameInfo.players.map(p => {name: p.name});
       Object.keys(this.people).forEach(sid => {
-        if (![this.st.user.sid,target].includes(sid))
+        if (![this.st.user.sid,oppsid].includes(sid))
         {
           this.st.conn.send(JSON.stringify({code:"game",
             game: { //minimal game info:
               id: gameInfo.id,
-              players: playersNames,
+              players: gameInfo.players,
               vid: gameInfo.vid,
               timeControl: gameInfo.timeControl,
             },