X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=b364568420546d257962fe4d84e20fe4347a460b;hb=d641bec1b3b299e16b7da93f966dad0b0bd35088;hp=0bc037a7a95de145f36b22a4c1a6e80d5eadb2b0;hpb=4f51861013271a060b358884097a676e3d42d496;p=vchess.git

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index 0bc037a7..b3645684 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -1,66 +1,76 @@
 <template lang="pug">
 main
   input#modalInfo.modal(type="checkbox")
-  div(role="dialog" aria-labelledby="infoMessage")
+  div#infoDiv(role="dialog" data-checkbox="modalInfo" aria-labelledby="infoMessage")
     .card.smallpad.small-modal.text-center
       label.modal-close(for="modalInfo")
       h3#infoMessage.section
         p(v-html="infoMessage")
   input#modalNewgame.modal(type="checkbox")
-  div(role="dialog" data-checkbox="modalNewgame"
+  div#newgameDiv(role="dialog" data-checkbox="modalNewgame"
       aria-labelledby="titleFenedit")
     .card.smallpad(@keyup.enter="newChallenge")
       label#closeNewgame.modal-close(for="modalNewgame")
       fieldset
-        label(for="selectVariant") {{ st.tr["Variant"] }}
+        label(for="selectVariant") {{ st.tr["Variant"] }} *
         select#selectVariant(v-model="newchallenge.vid")
-          option(v-for="v in st.variants" :value="v.id") {{ v.name }}
+          option(v-for="v in st.variants" :value="v.id"
+              :selected="newchallenge.vid==v.id")
+            | {{ v.name }}
       fieldset
-        label(for="timeControl") {{ st.tr["Time control"] }}
+        label(for="timeControl") {{ st.tr["Cadence"] }} *
+        div#predefinedTimeControls
+          button 3+2
+          button 5+3
+          button 15+5
         input#timeControl(type="text" v-model="newchallenge.timeControl"
-          placeholder="3m+2s, 1h+30s, 7d+1d ...")
+          placeholder="5+0, 1h+30s, 7d+1d ...")
       fieldset(v-if="st.user.id > 0")
-        label(for="selectPlayers") {{ st.tr["Play with? (optional)"] }}
+        label(for="selectPlayers") {{ st.tr["Play with?"] }}
         input#selectPlayers(type="text" v-model="newchallenge.to")
-      fieldset(v-if="st.user.id > 0")
-        label(for="inputFen") {{ st.tr["FEN (optional)"] }}
+      fieldset(v-if="st.user.id > 0 && newchallenge.to.length > 0")
+        label(for="inputFen") FEN
         input#inputFen(type="text" v-model="newchallenge.fen")
       button(@click="newChallenge") {{ st.tr["Send challenge"] }}
   .row
     .col-sm-12
-      button#newGame(onClick="doClick('modalNewgame')") New game
+      button#newGame(onClick="doClick('modalNewgame')") {{ st.tr["New game"] }}
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-      .collapse
-        div
-          .button-group
-            button(@click="cdisplay='live'") Live Challenges
-            button(@click="cdisplay='corr'") Correspondance challenges
-          ChallengeList(v-show="cdisplay=='live'"
-            :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
-          ChallengeList(v-show="cdisplay=='corr'"
-            :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
-        div
-          .button-group
-            button(@click="pdisplay='players'") Players
-            button(@click="pdisplay='chat'") Chat
-          #players(v-show="pdisplay=='players'")
-            p(v-for="p in uniquePlayers")
-              span(:class="{anonymous: !!p.count}")
-                | {{ (p.name || '@nonymous') + (!!p.count ? " ("+p.count+")" : "") }}
-              button.player-action(v-if="!p.count && p.name != st.user.name"
-                  @click="challOrWatch(p,$event)")
-                | {{ whatPlayerDoes(p) }}
-          #chat(v-show="pdisplay=='chat'")
-            Chat(:players="[]")
-        div
-          .button-group
-            button(@click="gdisplay='live'") Live games
-            button(@click="gdisplay='corr'") Correspondance games
-          GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
-            @show-game="showGame")
-          GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
-            @show-game="showGame")
+      div
+        .button-group
+          button(@click="(e) => setDisplay('c','live',e)" class="active")
+            | {{ st.tr["Live challenges"] }}
+          button(@click="(e) => setDisplay('c','corr',e)")
+            | {{ st.tr["Correspondance challenges"] }}
+        ChallengeList(v-show="cdisplay=='live'"
+          :challenges="filterChallenges('live')" @click-challenge="clickChallenge")
+        ChallengeList(v-show="cdisplay=='corr'"
+          :challenges="filterChallenges('corr')" @click-challenge="clickChallenge")
+      #people
+        h3.text-center {{ st.tr["Who's there?"] }}
+        #players
+          p(v-for="sid in Object.keys(people)" v-if="!!people[sid].name")
+            span {{ people[sid].name }}
+            button.player-action(
+              v-if="people[sid].name != st.user.name"
+              @click="challOrWatch(sid, $event)"
+            )
+              | {{ st.tr[!!people[sid].gamer ? 'Playing' : 'Available'] }}
+          p.anonymous @nonymous ({{ anonymousCount }})
+        #chat
+          Chat(:newChat="newChat" @mychat="processChat")
+        .clearer
+      div
+        .button-group
+          button(@click="(e) => setDisplay('g','live',e)" class="active")
+            | {{ st.tr["Live games"] }}
+          button(@click="(e) => setDisplay('g','corr',e)")
+            | {{ st.tr["Correspondance games"] }}
+        GameList(v-show="gdisplay=='live'" :games="filterGames('live')"
+          @show-game="showGame")
+        GameList(v-show="gdisplay=='corr'" :games="filterGames('corr')"
+          @show-game="showGame")
 </template>
 
 <script>
@@ -73,6 +83,8 @@ import Chat from "@/components/Chat.vue";
 import GameList from "@/components/GameList.vue";
 import ChallengeList from "@/components/ChallengeList.vue";
 import { GameStorage } from "@/utils/gameStorage";
+import { processModalClick } from "@/utils/modalClick";
+
 export default {
   name: "my-hall",
   components: {
@@ -92,10 +104,11 @@ export default {
       infoMessage: "",
       newchallenge: {
         fen: "",
-        vid: 0,
+        vid: localStorage.getItem("vid") || "",
         to: "", //name of challenged player (if any)
-        timeControl: "", //"2m+2s" ...etc
+        timeControl: localStorage.getItem("timeControl") || "",
       },
+      newChat: "",
     };
   },
   watch: {
@@ -113,38 +126,16 @@ export default {
     },
   },
   computed: {
-    uniquePlayers: function() {
-      // Show e.g. "@nonymous (5)", and do nothing on click on anonymous
-      let anonymous = {name:"", count:0};
-      let playerList = {};
-      Object.values(this.people).forEach(p => {
-        if (p.id > 0)
-        {
-          // We don't count registered users connections: either they are here or not.
-          if (!playerList[p.id])
-            playerList[p.id] = {name: p.name};
-        }
-        else
-          anonymous.count++;
-      });
-      if (anonymous.count > 0)
-        playerList[0] = anonymous;
-      return Object.values(playerList);
+    anonymousCount: function() {
+      let count = 0;
+      Object.values(this.people).forEach(p => { count += (!p.name ? 1 : 0); });
+      return count;
     },
   },
   created: function() {
     // Always add myself to players' list
     const my = this.st.user;
     this.$set(this.people, my.sid, {id:my.id, name:my.name});
-    // Retrieve live challenge (not older than 30 minute) if any:
-    const chall = JSON.parse(localStorage.getItem("challenge") || "false");
-    if (!!chall)
-    {
-      if ((Date.now() - chall.added)/1000 <= 30*60)
-        this.challenges.push(chall);
-      else
-        localStorage.removeItem("challenge");
-    }
     // Ask server for current corr games (all but mines)
     ajax(
       "/games",
@@ -158,7 +149,7 @@ export default {
         }));
       }
     );
-    // Also ask for corr challenges (open + sent to me)
+    // Also ask for corr challenges (open + sent by/to me)
     ajax(
       "/challenges",
       "GET",
@@ -166,29 +157,53 @@ export default {
       response => {
         // Gather all senders names, and then retrieve full identity:
         // (TODO [perf]: some might be online...)
-        const uids = response.challenges.map(c => { return c.uid });
-        ajax("/users",
-          "GET",
-          { ids: uids.join(",") },
-          response2 => {
-            let names = {};
-            response2.users.forEach(u => {names[u.id] = u.name});
-            this.challenges = this.challenges.concat(
-              response.challenges.map(c => {
-                // (just players names in fact)
-                const from = {name: names[c.uid], id: c.uid};
-                const type = this.classifyObject(c);
-                const vname = this.getVname(c.vid);
-                return Object.assign({}, c, {type: type, vname: vname, from: from});
-              })
-            )
-          }
-        );
+        let names = {};
+        response.challenges.forEach(c => {
+          if (c.uid != this.st.user.id)
+            names[c.uid] = ""; //unknwon for now
+          else if (!!c.target && c.target != this.st.user.id)
+            names[c.target] = "";
+        });
+        const addChallenges = (newChalls) => {
+          names[this.st.user.id] = this.st.user.name; //in case of
+          this.challenges = this.challenges.concat(
+            response.challenges.map(c => {
+              const from = {name: names[c.uid], id: c.uid}; //or just name
+              const type = this.classifyObject(c);
+              const vname = this.getVname(c.vid);
+              return Object.assign({},
+                {
+                  type: type,
+                  vname: vname,
+                  from: from,
+                  to: (!!c.target ? names[c.target] : ""),
+                },
+                c);
+            })
+          );
+        };
+        if (names !== {})
+        {
+          ajax("/users",
+            "GET",
+            { ids: Object.keys(names).join(",") },
+            response2 => {
+              response2.users.forEach(u => {names[u.id] = u.name});
+              addChallenges();
+            }
+          );
+        }
+        else
+          addChallenges();
       }
     );
     // 0.1] Ask server for room composition:
     const funcPollClients = () => {
+      // Same strategy as in Game.vue: send connection
+      // after we're sure WebSocket is initialized
+      this.st.conn.send(JSON.stringify({code:"connect"}));
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
+      this.st.conn.send(JSON.stringify({code:"pollgamers"}));
     };
     if (!!this.st.conn && this.st.conn.readyState == 1) //1 == OPEN state
       funcPollClients();
@@ -202,6 +217,15 @@ export default {
     };
     this.st.conn.onclose = socketCloseListener;
   },
+  mounted: function() {
+    [document.getElementById("infoDiv"),document.getElementById("newgameDiv")]
+      .forEach(elt => elt.addEventListener("click", processModalClick));
+    document.querySelectorAll("#predefinedTimeControls > button").forEach(
+      (b) => { b.addEventListener("click",
+        () => { this.newchallenge.timeControl = b.innerHTML; }
+      )}
+    );
+  },
   methods: {
     // Helpers:
     filterChallenges: function(type) {
@@ -211,7 +235,6 @@ export default {
       return this.games.filter(g => g.type == type);
     },
     classifyObject: function(o) { //challenge or game
-      // Heuristic: should work for most cases... (TODO)
       return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
     },
     showGame: function(g) {
@@ -222,49 +245,61 @@ export default {
         url += "?rid=" + g.rid;
       this.$router.push(url);
     },
+    setDisplay: function(letter, type, e) {
+      this[letter + "display"] = type;
+      e.target.classList.add("active");
+      if (!!e.target.previousElementSibling)
+        e.target.previousElementSibling.classList.remove("active");
+      else
+        e.target.nextElementSibling.classList.remove("active");
+    },
     getVname: function(vid) {
       const variant = this.st.variants.find(v => v.id == vid);
       // this.st.variants might be uninitialized (variant == null)
       return (!!variant ? variant.name : "");
     },
-    whatPlayerDoes: function(p) {
-      if (this.games.some(g => g.type == "live"
-        && g.players.some(pl => pl.sid == p.sid)))
-      {
-        return "Playing";
-      }
-      return "Challenge"; //player is available
+    processChat: function(chat) {
+      // When received on server, this will trigger a "notifyRoom"
+      this.st.conn.send(JSON.stringify({code:"newchat", chat: chat}));
     },
     sendSomethingTo: function(to, code, obj, warnDisconnected) {
       const doSend = (code, obj, sid) => {
         this.st.conn.send(JSON.stringify(Object.assign(
-          {},
           {code: code},
           obj,
           {target: sid}
         )));
       };
-      if (!!to)
+      if (!to || (!to.sid && !to.name))
       {
-        // Challenge with targeted players
-        const targetSid =
-          Object.keys(this.people).find(sid => this.people[sid].name == to);
-        if (!targetSid)
-        {
-          if (!!warnDisconnected)
-            alert("Warning: " + pname + " is not connected");
-        }
-        else
-          doSend(code, obj, targetSid);
-      }
-      else
-      {
-        // Open challenge: send to all connected players (except us)
+        // Open challenge: send to all connected players (me excepted)
         Object.keys(this.people).forEach(sid => {
           if (sid != this.st.user.sid)
             doSend(code, obj, sid);
         });
       }
+      else
+      {
+        let targetSid = "";
+        if (!!to.sid)
+          targetSid = to.sid;
+        else
+        {
+          if (to.name == this.st.user.name)
+            return alert(this.st.tr["Cannot challenge self"]);
+          // Challenge with targeted players
+          targetSid =
+            Object.keys(this.people).find(sid => this.people[sid].name == to.name);
+          if (!targetSid)
+          {
+            if (!!warnDisconnected)
+              alert(this.st.tr["Warning: target is not connected"]);
+            return false;
+          }
+        }
+        doSend(code, obj, targetSid);
+      }
+      return true;
     },
     // Messaging center:
     socketMessageListener: function(msg) {
@@ -272,23 +307,30 @@ export default {
       switch (data.code)
       {
         case "duplicate":
-          alert("Warning: duplicate 'offline' connection");
+          this.st.conn.send(JSON.stringify({code:"duplicate", page:"/"}));
+          this.st.conn.send = () => {};
+          alert(this.st.tr["Warning: multi-tabs not supported"]);
           break;
         // 0.2] Receive clients list (just socket IDs)
         case "pollclients":
-        {
           data.sockIds.forEach(sid => {
             this.$set(this.people, sid, {id:0, name:""});
-            // Ask identity, challenges and game(s)
+            // Ask identity and challenges
             this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
             this.st.conn.send(JSON.stringify({code:"askchallenge", target:sid}));
           });
+          break;
+        case "pollgamers":
+          // NOTE: we could make a difference between people in hall
+          // and gamers, but is it necessary?
+          data.sockIds.forEach(sid => {
+            this.$set(this.people, sid, {id:0, name:"", gamer:true});
+            this.st.conn.send(JSON.stringify({code:"askidentity", target:sid}));
+          });
           // Also ask current games to all playing peers (TODO: some design issue)
           this.st.conn.send(JSON.stringify({code:"askgames"}));
           break;
-        }
         case "askidentity":
-        {
           // Request for identification: reply if I'm not anonymous
           if (this.st.user.id > 0)
           {
@@ -302,21 +344,34 @@ export default {
               target:data.from}));
           }
           break;
-        }
         case "identity":
-        {
           this.$set(this.people, data.user.sid,
-            {id: data.user.id, name: data.user.name});
+            {
+              id: data.user.id,
+              name: data.user.name,
+              gamer: this.people[data.user.sid].gamer,
+            });
           break;
-        }
         case "askchallenge":
         {
           // Send my current live challenge (if any)
-          const cIdx = this.challenges
-            .findIndex(c => c.from.sid == this.st.user.sid && c.type == "live");
+          const cIdx = this.challenges.findIndex(c =>
+            c.from.sid == this.st.user.sid && c.type == "live");
           if (cIdx >= 0)
           {
             const c = this.challenges[cIdx];
+            // TODO: code below requires "c.to" to have given his identity,
+            // but it can happen that the identity arrives later, which
+            // prevent him from receiving the challenge.
+            // ==> Filter later (when receiving challenge)
+//            if (!!c.to)
+//            {
+//              // Only share targeted challenges to the targets:
+//              const toSid = Object.keys(this.people).find(k =>
+//                this.people[k].name == c.to);
+//              if (toSid != data.from)
+//                return;
+//            }
             const myChallenge =
             {
               // Minimal challenge informations: (from not required)
@@ -324,7 +379,8 @@ export default {
               to: c.to,
               fen: c.fen,
               vid: c.vid,
-              timeControl: c.timeControl
+              timeControl: c.timeControl,
+              added: c.added,
             };
             this.st.conn.send(JSON.stringify({code:"challenge",
               chall:myChallenge, target:data.from}));
@@ -332,36 +388,42 @@ export default {
           break;
         }
         case "challenge":
-        {
           // Receive challenge from some player (+sid)
-          let newChall = data.chall;
-          newChall.type = this.classifyObject(data.chall);
-          newChall.from =
-            Object.assign({sid:data.from}, this.people[data.from]);
-          newChall.added = Date.now(); //TODO: this is reception timestamp, not creation
-          newChall.vname = this.getVname(newChall.vid);
-          this.challenges.push(newChall);
+          // NOTE about next condition: see "askchallenge" case.
+          if (!data.chall.to || data.chall.to == this.st.user.name)
+          {
+            let newChall = data.chall;
+            newChall.type = this.classifyObject(data.chall);
+            newChall.from =
+              Object.assign({sid:data.from}, this.people[data.from]);
+            newChall.vname = this.getVname(newChall.vid);
+            this.challenges.push(newChall);
+          }
           break;
-        }
         case "game":
         {
           // Receive game from some player (+sid)
           // NOTE: it may be correspondance (if newgame while we are connected)
-          if (!this.games.some(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)
+          {
+            if (Math.random() < 0.5)
+              game.rid = data.from;
+          }
+          else
           {
             let newGame = data.game;
             newGame.type = this.classifyObject(data.game);
             newGame.vname = this.getVname(data.game.vid);
             newGame.rid = data.from;
-            newGame.score = "*";
+            if (!data.game.score)
+              newGame.score = "*";
             this.games.push(newGame);
           }
           break;
         }
         case "newgame":
-        {
-          // TODO: next line required ?!
-          //ArrayFun.remove(this.challenges, c => c.id == data.cid);
           // New game just started: data contain all information
           if (this.classifyObject(data.gameInfo) == "live")
             this.startNewGame(data.gameInfo);
@@ -375,62 +437,70 @@ export default {
             setTimeout(() => { modalBox.checked = false; }, 3000);
           }
           break;
-        }
+        case "newchat":
+          this.newChat = data.chat;
+          break;
         case "refusechallenge":
-        {
-          alert(this.people[data.from].name + " declined your challenge");
           ArrayFun.remove(this.challenges, c => c.id == data.cid);
+          alert(this.st.tr["Challenge declined"]);
           break;
-        }
         case "deletechallenge":
-        {
           // NOTE: the challenge may be already removed
           ArrayFun.remove(this.challenges, c => c.id == data.cid);
-          localStorage.removeItem("challenge"); //in case of
           break;
-        }
         case "connect":
-        {
-          this.$set(this.people, data.from, {name:"", id:0});
+        case "gconnect":
+          this.$set(this.people, data.from, {name:"", id:0, gamer:data.code[0]=='g'});
           this.st.conn.send(JSON.stringify({code:"askidentity", target:data.from}));
-          this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
-          this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
+          if (data.code == "connect")
+            this.st.conn.send(JSON.stringify({code:"askchallenge", target:data.from}));
+          else
+            this.st.conn.send(JSON.stringify({code:"askgame", target:data.from}));
           break;
-        }
         case "disconnect":
-        {
+        case "gdisconnect":
           this.$delete(this.people, data.from);
-          // Also remove all challenges sent by this player:
-          ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
-          // And all live games where he plays and no other opponent is online
-          ArrayFun.remove(this.games, g =>
-            g.type == "live" && (g.players.every(p => p.sid == data.from
-              || !this.people[p.sid])), "all");
+          if (data.code == "disconnect")
+          {
+            // Also remove all challenges sent by this player:
+            ArrayFun.remove(this.challenges, c => c.from.sid == data.from);
+          }
+          else
+          {
+            // And all live games where he plays and no other opponent is online
+            ArrayFun.remove(this.games, g =>
+              g.type == "live" && (g.players.every(p => p.sid == data.from
+                || !this.people[p.sid])), "all");
+          }
           break;
-        }
       }
     },
     // Challenge lifecycle:
-    tryChallenge: function(player) {
-      if (player.id == 0)
+    tryChallenge: function(sid) {
+      if (this.people[sid].id == 0)
         return; //anonymous players cannot be challenged
-      this.newchallenge.to = player.name;
+      // TODO: SID is available, so we could use it instead of searching from name
+      this.newchallenge.to = this.people[sid].name;
       doClick("modalNewgame");
     },
-    challOrWatch: function(p, e) {
-      switch (e.target.innerHTML)
+    challOrWatch: function(sid) {
+      if (!this.people[sid].gamer)
       {
-        case "Challenge":
-          this.tryChallenge(p);
-          break;
-        case "Playing":
-          // NOTE: this search for game was already done for rendering
-          this.showGame(this.games.find(
-            g => g.type=="live" && g.players.some(pl => pl.sid == p.sid)));
-          break;
-      };
+        // Available, in Hall
+        this.tryChallenge(sid);
+      }
+      else
+      {
+        // Playing, in Game
+        this.showGame(this.games.find(
+          g => g.players.some(pl => pl.sid == sid || pl.uid == this.people[sid].id)));
+      }
     },
     newChallenge: async function() {
+      if (this.newchallenge.vid == "")
+        return alert(this.st.tr["Please select a variant"]);
+      if (!!this.newchallenge.to && this.newchallenge.to == this.st.user.name)
+        return alert(this.st.tr["Self-challenge is forbidden"]);
       const vname = this.getVname(this.newchallenge.vid);
       const vModule = await import("@/variants/" + vname + ".js");
       window.V = vModule.VariantRules;
@@ -441,13 +511,35 @@ export default {
         return alert(error);
       const ctype = this.classifyObject(this.newchallenge);
       if (ctype == "corr" && this.st.user.id <= 0)
-        return alert("Please log in to play correspondance games");
+        return alert(this.st.tr["Please log in to play correspondance games"]);
       // NOTE: "from" information is not required here
       let chall = Object.assign({}, this.newchallenge);
       const finishAddChallenge = (cid,warnDisconnected) => {
         chall.id = cid || "c" + getRandString();
         // Send challenge to peers (if connected)
-        this.sendSomethingTo(chall.to, "challenge", {chall:chall}, !!warnDisconnected);
+        const isSent = this.sendSomethingTo({name:chall.to}, "challenge",
+          {chall:chall}, !!warnDisconnected);
+        if (!isSent)
+          return;
+        // Remove old challenge if any (only one at a time of a given type):
+        const cIdx = this.challenges.findIndex(c =>
+          (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) && c.type == ctype);
+        if (cIdx >= 0)
+        {
+          // Delete current challenge (will be replaced now)
+          this.sendSomethingTo({name:this.challenges[cIdx].to},
+            "deletechallenge", {cid:this.challenges[cIdx].id});
+          if (ctype == "corr")
+          {
+            ajax(
+              "/challenges",
+              "DELETE",
+              {id: this.challenges[cIdx].id}
+            );
+          }
+          this.challenges.splice(cIdx, 1);
+        }
+        // Add new challenge:
         chall.added = Date.now();
         // NOTE: vname and type are redundant (can be deduced from timeControl + vid)
         chall.type = ctype;
@@ -458,27 +550,11 @@ export default {
           name: this.st.user.name,
         };
         this.challenges.push(chall);
-        if (ctype == "live")
-          localStorage.setItem("challenge", JSON.stringify(chall));
+        // Remember timeControl  + vid for quicker further challenges:
+        localStorage.setItem("timeControl", chall.timeControl);
+        localStorage.setItem("vid", chall.vid);
         document.getElementById("modalNewgame").checked = false;
       };
-      const cIdx = this.challenges.findIndex(
-        c => c.from.sid == this.st.user.sid && c.type == ctype);
-      if (cIdx >= 0)
-      {
-        // Delete current challenge (will be replaced now)
-        this.sendSomethingTo(this.challenges[cIdx].to,
-          "deletechallenge", {cid:this.challenges[cIdx].id});
-        if (ctype == "corr")
-        {
-          ajax(
-            "/challenges",
-            "DELETE",
-            {id: this.challenges[cIdx].id}
-          );
-        }
-        this.challenges.splice(cIdx, 1);
-      }
       if (ctype == "live")
       {
         // Live challenges have a random ID
@@ -501,7 +577,7 @@ export default {
       if (!myChallenge)
       {
         if (c.type == "corr" && this.st.user.id <= 0)
-          return alert("Please log in to accept corr challenges");
+          return alert(this.st.tr["Please log in to accept corr challenges"]);
         c.accepted = true;
         if (!!c.to) //c.to == this.st.user.name (connected)
         {
@@ -523,6 +599,7 @@ export default {
             code: "refusechallenge",
             cid: c.id, target: c.from.sid}));
         }
+        this.sendSomethingTo(!!c.to ? {sid:c.from.sid} : null, "deletechallenge", {cid:c.id});
       }
       else //my challenge
       {
@@ -534,15 +611,12 @@ export default {
             {id: c.id}
           );
         }
-        else //live
-          localStorage.removeItem("challenge");
+        this.sendSomethingTo({name:c.to}, "deletechallenge", {cid:c.id});
       }
-      // In (almost) all cases, the challenge is consumed:
+      // In all cases, the challenge is consumed:
       ArrayFun.remove(this.challenges, ch => ch.id == c.id);
-      // NOTE: deletechallenge event might be redundant (but it's easier this way)
-      this.sendSomethingTo((!!c.to ? c.from : null), "deletechallenge", {cid:c.id});
     },
-    // NOTE: when launching game, the challenge is already deleted
+    // NOTE: when launching game, the challenge is already being deleted
     launchGame: async function(c) {
       const vModule = await import("@/variants/" + c.vname + ".js");
       window.V = vModule.VariantRules;
@@ -556,21 +630,22 @@ export default {
         vname: c.vname, //theoretically vid is enough, but much easier with vname
         timeControl: c.timeControl,
       };
-      let target = c.from.sid; //may not be defined if corr + offline opp
-      if (!target)
+      let oppsid = c.from.sid; //may not be defined if corr + offline opp
+      if (!oppsid)
       {
-        target = Object.keys(this.people).find(sid =>
+        oppsid = Object.keys(this.people).find(sid =>
           this.people[sid].id == c.from.id);
       }
       const tryNotifyOpponent = () => {
-        if (!!target) //opponent is online
+        if (!!oppsid) //opponent is online
         {
           this.st.conn.send(JSON.stringify({code:"newgame",
-            gameInfo:gameInfo, target:target, cid:c.id}));
+            gameInfo:gameInfo, target:oppsid, cid:c.id}));
         }
       };
       if (c.type == "live")
       {
+        // NOTE: in this case we are sure opponent is online
         tryNotifyOpponent();
         this.startNewGame(gameInfo);
       }
@@ -588,14 +663,19 @@ export default {
         );
       }
       // Send game info to everyone except opponent (and me)
-      this.st.conn.send(JSON.stringify({code:"game",
-        game: { //minimal game info:
-          id: gameInfo.id,
-          players: gameInfo.players.map(p => p.name),
-          vid: gameInfo.vid,
-          timeControl: gameInfo.timeControl,
-        },
-        oppsid: target}));
+      Object.keys(this.people).forEach(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: gameInfo.players,
+              vid: gameInfo.vid,
+              timeControl: gameInfo.timeControl,
+            },
+            target: sid}));
+        }
+      });
     },
     // NOTE: for live games only (corr games start on the server)
     startNewGame: function(gameInfo) {
@@ -619,18 +699,30 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+.active
+  color: #42a983
 #newGame
   display: block
   margin: 10px auto 5px auto
+#people
+  width: 100%
+#players
+  width: 50%
+  position: relative
+  float: left
+#chat
+  width: 50%
+  float: left
+  position: relative
+@media screen and (max-width: 767px)
+  #players, #chats
+    width: 100%
 #chat > .card
   max-width: 100%
   margin: 0;
   border: none;
 #players > p
-  margin-left: 40%
-@media screen and (max-width: 767px)
-  #players > p
-    margin-left: 5px
+  margin-left: 5px
 .anonymous
   font-style: italic
 button.player-action