Partial refactoring/bug fix w/ session time correction

This commit is contained in:
IrPgFKS0 committed 2023-09-09 22:57:39 -07:00
1 parent 7c896f3920
commit 49ad83a71a
6 files changed
+141 -143

No files matched your search

+8 -9
View File
@@ -1,15 +1,14 @@
const { EmbedBuilder } = require('discord.js');
module.exports = {
SendConnectionLogs: async (client, guildId, data) => {
let guild = await client.GetGuild(guildId);
if (!client.exists(guild.connectionLogsChannel)) return;
const channel = client.GetChannel(guild.connectionLogsChannel);
let newDt = await client.getDateEST(data.time);
let unixTime = Math.floor(newDt.getTime()/1000);
let unixTime = Math.floor(newDt.getTime() / 1000);
let connectionLog = new EmbedBuilder()
.setColor(data.connected ? client.config.Colors.Green : client.config.Colors.Red)
@@ -17,7 +16,7 @@ module.exports = {
if (!data.connected) {
if (!(data.lastConnectionDate == null)) {
let oldUnixTime = Math.floor(data.lastConnectionDate.getTime()/1000);
let oldUnixTime = Math.floor(data.lastConnectionDate.getTime() / 1000);
let sessionTime = client.secondsToDhms(unixTime - oldUnixTime);
connectionLog.addFields({ name: '**Session Time**', value: `**${sessionTime}**`, inline: false });
} else connectionLog.addFields({ name: '**Session Time**', value: `**Unknown**`, inline: false });
@@ -28,7 +27,7 @@ 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);
@@ -36,21 +35,21 @@ module.exports = {
// If diff is greater than 5 minutes, not a combat log
// or if death after last combat
if (data.lastDamageDate <= data.lastDeathDate) return;
if (diffSeconds > (5 * 60)) return;
if (diffSeconds > 5 * 60) return;
let guild = await client.GetGuild(guildId);
if (!client.exists(guild.connectionLogsChannel)) return;
const channel = client.GetChannel(guild.connectionLogsChannel);
if (!channel) return;
let unixTime = Math.floor(newDt.getTime()/1000);
let unixTime = Math.floor(newDt.getTime() / 1000);
let combatLog = new EmbedBuilder()
.setColor(client.config.Colors.Red)
.setDescription(`**NOTICE:**\n**${data.player}** has combat logged at <t:${unixTime}> when fighting **${data.lastHitBy}\nLocation [${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})**`);
if (client.exists(guild.adminRole)) channel.send({ content: `<@&${guild.adminRole}>` });
return channel.send({ embeds: [combatLog] });
}
}
};