From 14c3c7b99f6a1e7c3b4372e7d6a797a933de5989 Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Sun, 2 Jul 2023 10:36:12 -0700 Subject: [PATCH] prevent repeat logs? --- commands/event.js | 2 +- package.json | 2 +- structures/DayzArmbands.js | 3 ++- util/NitradoAPI.js | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/commands/event.js b/commands/event.js index dab4c71..a99f7b7 100644 --- a/commands/event.js +++ b/commands/event.js @@ -76,7 +76,7 @@ module.exports = { if (args[0].name == 'player-track') { let playerStat = GuildDB.playerstats.find(stat => stat.gamertag == args[0].options[0].value ); - if (playerStat == undefined) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** This gamertag \` ${args[1].value} \` cannot be found, the gamertag may be incorrect or this player has not logged onto the server before for at least \` 5 minutes \`.`)] }); + if (playerStat == undefined) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** This gamertag \` ${args[0].options[0].value} \` cannot be found, the gamertag may be incorrect or this player has not logged onto the server before for at least \` 5 minutes \`.`)] }); let event = { type: args[0].name, diff --git a/package.json b/package.json index 2cfe872..f66fb3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayz-armbands", - "version": "8.2.6", + "version": "8.2.7", "description": "A General Purpose Discord Bot for DayZ Servers.", "main": "index.js", "nodemonConfig": { diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js index 8f2a810..90f9459 100644 --- a/structures/DayzArmbands.js +++ b/structures/DayzArmbands.js @@ -200,7 +200,8 @@ class DayzArmbands extends Client { c.log(`...Logs Tick - ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}...`); c.activePlayersTick++; - await DownloadNitradoFile(c, `/games/${c.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => { + await DownloadNitradoFile(c, `/games/${c.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async (status) => { + if (status == -1) return c.error('...Failed to Download logs...'); c.log('...Downloaded logs...'); await c.readLogs(c.config.GuildID).then(async () => { c.log('...Analyzed logs...'); diff --git a/util/NitradoAPI.js b/util/NitradoAPI.js index 66b1572..54b201a 100644 --- a/util/NitradoAPI.js +++ b/util/NitradoAPI.js @@ -19,10 +19,11 @@ module.exports = { if (!res.data || !res.data.token) { client.error(`Error downloading File "${filename}":`); client.error(res); - return; + return -1; } const { body } = await fetch(res.data.token.url); await finished(Readable.fromWeb(body).pipe(stream)); + return 0; }, HandlePlayerBan: async (client, gamertag, ban) => {