X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=server%2Fsockets.js;h=c2b41e88c3ede21b381593db92d819916988f8d3;hp=ef46427bacbd3e9690b912fb4ce0a5581522f38d;hb=bae751bc6bc548791772c3ff5883a03deeb77264;hpb=e8ea1e351fae405a4f3b0a11b17ddada560ba052 diff --git a/server/sockets.js b/server/sockets.js index ef46427b..c2b41e88 100644 --- a/server/sockets.js +++ b/server/sockets.js @@ -30,7 +30,8 @@ module.exports = function(wss) { const discordClient = new Discord.Client(); let discordChannel = null; if (token.length > 0) { - discordClient.login(token).then( () => { + discordClient.login(token); + discordClient.once("ready", () => { discordChannel = discordClient.channels.cache.get(channel); }); } @@ -217,14 +218,23 @@ module.exports = function(wss) { case "rematchoffer": case "draw": // "newgame" message can provide a page (corr Game --> Hall) + if (obj.code == "newchallenge") { + // Filter out targeted challenges and correspondance games: + if (!obj.data.to && obj.data.cadence.indexOf('d') < 0) { + const challMsg = ( + (obj.data.sender || "@nonymous") + " : " + + "**" + obj.data.vname + "** " + + "[" + obj.data.cadence + "] " + ); + if (!!discordChannel) discordChannel.send(challMsg); + else + // Log when running locally (dev, debug): + console.log(challMsg); + } + delete obj.data["sender"]; + } notifyRoom( obj.page || page, obj.code, {data: obj.data}, obj.excluded); - if (!!discordChannel && obj.code == "newchallenge") { - discordChannel.send("New challenge: " + - obj.data.vname + - " [" + obj.data.cadence + "]" + - " - https://vchess.club"); - } break; case "rnewgame":