From 3a6a19040457c443d52851d4a0008e072d843f79 Mon Sep 17 00:00:00 2001 From: Junior Date: Fri, 22 Nov 2024 20:55:20 +0000 Subject: [PATCH] Move code inside the success promise for online status --- index.js | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/index.js b/index.js index 99b3144..3961e61 100644 --- a/index.js +++ b/index.js @@ -41,45 +41,45 @@ function getOnlineReport(channel = null) { }); Servers.forEach(function (server) { if ( !online[server.slug] ) return; - const q = new Query({host: server.rconAddress, port: server.queryPort, timeout: 250}); + const q = new Query({host: server.rconAddress, port: server.queryPort, timeout: 7250}); try { q.fullStat() .then(response => { online[server.slug].tested = true; online[server.slug].online = true; online[server.slug].players = response.players; - //sendOnline(online, channel); }) - .then(() => { q.close(); }) + .then(success => { + q.close(); + let playerCount = 0; + let embed = new EmbedBuilder() + .setColor(0x44ff44) + .setThumbnail(Config.GUILD_THUMBNAIL); + for ( const s in online ) { + if ( !online[s].tested ) { + continue; + } + if ( online[s].players.length > 0 ) { + playerCount += online[s].players.length; + embed.addFields({name: "**"+online[s].name+"**", value: online[s].players.join(', '), inline: false}); + } + }; + embed.setTitle("**Players Currently Online:** " + playerCount); + if ( channel !== null ) channel.send({embeds: [embed]}); + if ( Config.PRESENCE_INTERVAL != 0 ) { + client.user.setPresence({ activities: [{ name: "Online: " + playerCount }], status: 'online' }); + } + }) .catch(e => { q.close(); //console.log("slug: " + server.slug); //console.log(online); online[server.slug].tested = true; - //sendOnline(online, channel); }); } catch (e) { console.log(e); } }); - let playerCount = 0; - let embed = new EmbedBuilder() - .setColor(0x44ff44) - .setThumbnail(Config.GUILD_THUMBNAIL); - for ( const s in online ) { - if ( !online[s].tested ) { - continue; - } - if ( online[s].players.length > 0 ) { - playerCount += online[s].players.length; - embed.addFields({name: "**"+online[s].name+"**", value: online[s].players.join(', '), inline: false}); - } - }; - embed.setTitle("**Players Currently Online:** " + playerCount); - if ( channel !== null ) channel.send({embeds: [embed]}); - if ( Config.PRESENCE_INTERVAL != 0 ) { - client.user.setPresence({ activities: [{ name: "Online: " + playerCount }], status: 'online' }); - } } client.on('messageCreate', (msg) => { @@ -200,4 +200,4 @@ client.on('messageCreate', (msg) => { client.login(Config.BOT_TOKEN); -// vim: set ts=4 sw=4: +// vim: set et ts=4 sw=4: