diff --git a/commands/bank.js b/commands/bank.js index 8218b2e..665f7dc 100644 --- a/commands/bank.js +++ b/commands/bank.js @@ -236,9 +236,9 @@ module.exports = { } // This lame line of code to get username without ping on discord - const User = client.users.cache.get(targetUserID); + const DiscordUser = client.users.cache.get(targetUserID); - balanceEmbed.setTitle(`${User.tag}'s Bank Records`); + balanceEmbed.setTitle(`${DiscordUser.tag.split("#")[0]}'s Bank Records`); balanceEmbed.addFields( { name: '**Cash**', value: `$${targetUserBanking.guilds[GuildDB.serverID].bankAccount.cash.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2})}`, inline: true }, { name: '**Bank**', value: `$${targetUserBanking.guilds[GuildDB.serverID].bankAccount.balance.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2})}`, inline: true }, diff --git a/events/ready.js b/events/ready.js index 952124f..9880b15 100644 --- a/events/ready.js +++ b/events/ready.js @@ -7,5 +7,5 @@ module.exports = async (client) => { client.log(`Successfully Logged in as ${client.user.tag}`); client.log(`Ready to serve in ${client.channels.cache.size} channels on ${client.guilds.cache.size} servers, for a total of ${client.users.cache.size} users.`) client.RegisterSlashCommands(); - client.logsUpdateTimer(); + setInterval(client.logsUpdateTimer, client.timer); }; \ No newline at end of file diff --git a/package.json b/package.json index 2ab3765..92102fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayz-armbands", - "version": "6.3.8", + "version": "6.3.10", "description": "A General Purpose Discord Bot for DayZ Servers.", "main": "index.js", "nodemonConfig": { diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js index 554e00d..5873b4f 100644 --- a/structures/DayzArmbands.js +++ b/structures/DayzArmbands.js @@ -165,20 +165,17 @@ class DayzArmbands extends Client { } async logsUpdateTimer() { - setTimeout(async () => { - let t = new Date(); - this.log(`Logs Tick - ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}`); - this.activePlayersTick++; - - await DownloadNitradoFile(this, `/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => { - this.log('Downloaded logs'); - await this.readLogs(this.config.GuildID).then(async () => { - this.log('Analyzed logs'); - if (this.activePlayersTick == 12) await HandleActivePlayersList(this, this.config.GuildID); - }) + let t = new Date(); + this.log(`...Logs Tick - ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}...`); + this.activePlayersTick++; + + await DownloadNitradoFile(this, `/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => { + this.log('...Downloaded logs...'); + await this.readLogs(this.config.GuildID).then(async () => { + this.log('...Analyzed logs...'); + if (this.activePlayersTick == 12) await HandleActivePlayersList(this, this.config.GuildID); }) - this.logsUpdateTimer(); // restart this function - }, this.timer); // restart every 5 minutes during production + }); } async connectMongo(mongoURI, dbo) { diff --git a/util/NitradoAPI.js b/util/NitradoAPI.js index 0435684..66b1572 100644 --- a/util/NitradoAPI.js +++ b/util/NitradoAPI.js @@ -16,7 +16,7 @@ module.exports = { ).then(res => res); const stream = fs.createWriteStream(outputDir); - if (!res.data.token) { + if (!res.data || !res.data.token) { client.error(`Error downloading File "${filename}":`); client.error(res); return;