diff --git a/structures/DayzRBot.js b/structures/DayzRBot.js index 30bab2a..e622a80 100644 --- a/structures/DayzRBot.js +++ b/structures/DayzRBot.js @@ -1,6 +1,5 @@ const { RegisterGlobalCommands, RegisterGuildCommands } = require("../util/RegisterSlashCommands"); const { Collection, Client, EmbedBuilder, Routes } = require('discord.js'); -const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const MongoClient = require('mongodb').MongoClient; const { REST } = require('@discordjs/rest'); const Logger = require("../util/Logger"); @@ -80,7 +79,7 @@ class DayzRBot extends Client { return await rest.post(Routes.interactionCallback(interaction.id, interaction.token), { body: { - type: CommandOptions.Integer, + type: 4, data: message, } }); diff --git a/util/AdminLogsHandler.js b/util/AdminLogsHandler.js index 43cc0fb..6f42f58 100644 --- a/util/AdminLogsHandler.js +++ b/util/AdminLogsHandler.js @@ -28,14 +28,13 @@ module.exports = { DetectCombatLog: async (client, guildId, data) => { if (data.lastDamageDate == null) return; - let newDt = await client.getDateEST(data.time); - - let diffSeconds = Math.round((newDt.getTime() - data.lastDamageDate.getTime()) / 1000); + const newDt = await client.getDateEST(data.time); + const diffSeconds = Math.round((newDt.getTime() - data.lastDamageDate.getTime()) / 1000); // If diff is greater than 5 minutes, not a combat log // or if death after last combat + if (diffSeconds > (data.combatLogTimer * 60)) return; if (data.lastDamageDate <= data.lastDeathDate) return; - if (diffSeconds > 5 * 60) return; let guild = await client.GetGuild(guildId); if (!client.exists(guild.connectionLogsChannel)) return; diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js index 2f47a09..80d7dc1 100644 --- a/util/KillfeedHandler.js +++ b/util/KillfeedHandler.js @@ -72,8 +72,8 @@ module.exports = { else if (killedBy == Templates.Explosion) info.causeOfDeath = data[5]; else return stats; // Unknown template; - let newDt = await client.getDateEST(info.time); - let unixTime = Math.floor(newDt.getTime()/1000); + const newDt = await client.getDateEST(info.time); + const unixTime = Math.floor(newDt.getTime()/1000); const showCoords = client.exists(guild.showKillfeedCoords) ? guild.showKillfeedCoords : false; // default to false if no record of configuration. diff --git a/util/LogsHandler.js b/util/LogsHandler.js index 2714633..024804e 100644 --- a/util/LogsHandler.js +++ b/util/LogsHandler.js @@ -109,6 +109,7 @@ module.exports = { lastDamageDate: playerStat.lastDamageDate, lastHitBy: playerStat.lastHitBy, lastDeathDate: playerStat.lastDeathDate, + combatLogTimer: combatLogTimer, }); } } @@ -169,9 +170,7 @@ module.exports = { let playerStatIndex = stats.indexOf(playerStat); if (playerStat === undefined) playerStat = client.getDefaultPlayerStats(info.player, info.playerID); - const newDt = await client.getDateEST(info.time); - - playerStat.lastDamageDate = newDt; + playerStat.lastDamageDate = await client.getDateEST(info.time); playerStat.lastHitBy = info.attacker; if (playerStatIndex === -1) stats.push(playerStat);