X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FHall.vue;h=c943ff53097d2fc8661bb368520e19487c8a933e;hb=0c4c389681ffae83130e9b0b70fe51ebbaf5e5e9;hp=7c3a442de6b47e8fad388fdd153f229dbe6e95c0;hpb=af041c940f747ecca5d33c42042a62efd9039f10;p=vchess.git diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue index 7c3a442d..c943ff53 100644 --- a/client/src/views/Hall.vue +++ b/client/src/views/Hall.vue @@ -254,7 +254,7 @@ export default { let names = {}; response.challenges.forEach(c => { if (c.uid != this.st.user.id) names[c.uid] = ""; - else if (!!c.target && c.target != this.st.user.id) + else if (c.target && c.target != this.st.user.id) names[c.target] = ""; }); const addChallenges = () => { @@ -407,6 +407,15 @@ export default { processChat: function(chat) { this.send("newchat", { data: chat }); }, + getOppsid: function(c) { + let oppsid = c.from.sid; //may not be defined if corr + offline opp + if (!oppsid) { + oppsid = Object.keys(this.people).find( + sid => this.people[sid].id == c.from.id + ); + } + return oppsid; + }, // Messaging center: socketMessageListener: function(msg) { if (!this.conn) return; @@ -797,10 +806,9 @@ export default { }; this.launchGame(c); } else { - -console.log(c); - - this.send("refusechallenge", { data: c.id, target: c.from.sid }); + const oppsid = this.getOppsid(c); + if (oppsid) + this.send("refusechallenge", { data: c.id, target: oppsid }); } this.send("deletechallenge", { data: c.id }); }, @@ -860,13 +868,8 @@ console.log(c); vid: c.vid, cadence: c.cadence }; - let oppsid = c.from.sid; //may not be defined if corr + offline opp - if (!oppsid) { - oppsid = Object.keys(this.people).find( - sid => this.people[sid].id == c.from.id - ); - } const notifyNewgame = () => { + const oppsid = this.getOppsid(c); if (oppsid) //opponent is online this.send("startgame", { data: gameInfo, target: oppsid });