X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=c22c1e176cd702c5addee572db8a6fc2f55bb8ff;hb=c0b2760655298f07eb403da70307636e57b2813a;hp=0467dab97e006dc6272d86b670c5a57143da74e0;hpb=2be5d6140901fc7bb2a33d672e52cfdc545a1912;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 0467dab9..c22c1e17 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -93,6 +93,20 @@ export default { }, }; }, + watch: { + // st.variants changes only once, at loading from [] to [...] + "st.variants": function(variantArray) { + // Set potential challenges and games variant names: + this.challenges.forEach(c => { + if (c.vname == "") + c.vname = this.getVname(c.vid); + }); + this.games.forEach(g => { + if (g.vname == "") + g.vname = this.getVname(g.vid) + }); + }, + }, computed: { uniquePlayers: function() { // Show e.g. "@nonymous (5)", and do nothing on click on anonymous @@ -165,23 +179,6 @@ export default { ); } ); - // TODO: I don't like this code below; improvement? - let retryForVnames = setInterval(() => { - if (this.st.variants.length > 0) //variants array is loaded - { - if (this.games.length > 0 && this.games[0].vname == "") - { - // Fix games' vnames: - this.games.forEach(g => { g.vname = this.getVname(g.vid); }); - } - if (this.challenges.length > 0 && this.challenges[0].vname == "") - { - // Fix challenges' vnames: - this.challenges.forEach(c => { c.vname = this.getVname(c.vid); }); - } - clearInterval(retryForVnames); - } - }, 50); } // 0.1] Ask server for room composition: const funcPollClients = () => { @@ -499,7 +496,7 @@ export default { } if (c.accepted) { - c.seat = this.people[0]; //avoid sending email + c.seat = this.people[0]; //== this.st.user, avoid revealing email this.launchGame(c); } else @@ -535,8 +532,18 @@ export default { vid: c.vid, timeControl: c.timeControl, }; - this.st.conn.send(JSON.stringify({code:"newgame", - gameInfo:gameInfo, target:c.from.sid, cid:c.id})); + let target = c.from.sid; //may not be defined if corr + offline opp + if (!target) + { + const opponent = this.people.find(p => p.id == c.from.id); + if (!!opponent) + target = opponent.sid + } + if (!!target) //opponent is online + { + this.st.conn.send(JSON.stringify({code:"newgame", + gameInfo:gameInfo, target:target, cid:c.id})); + } if (c.type == "live") this.startNewGame(gameInfo); else //corr: game only on server @@ -554,6 +561,7 @@ export default { const game = Object.assign({}, gameInfo, { // (other) Game infos: constant fenStart: gameInfo.fen, + created: Date.now(), // Game state (including FEN): will be updated moves: [], clocks: [-1, -1], //-1 = unstarted