From 030ce256a51beaafab7f55906e5214e9c3c38282 Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Sun, 4 Jun 2023 12:37:11 -0700
Subject: [PATCH] add exception for killfeed logs

---
 package.json               |  2 +-
 structures/DayzArmbands.js |  3 ++-
 util/KillfeedHandler.js    | 21 +++++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 98f8256..af9cda4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dayz-armbands",
-  "version": "6.7.12",
+  "version": "6.7.13",
   "description": "A General Purpose Discord Bot for DayZ Servers.",
   "main": "index.js",
   "nodemonConfig": {
diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js
index 7269864..569b59e 100644
--- a/structures/DayzArmbands.js
+++ b/structures/DayzArmbands.js
@@ -143,7 +143,8 @@ class DayzArmbands extends Client {
       if ((i - 1) >= 0 && lines[i] == lines[i-1]) continue;
       if (lines[i].includes('connected') || lines[i].includes('pos=<') || lines[1].includes('hit by Player')) s = await HandlePlayerLogs(this, guildId, s, lines[i]);
       if (lines[i].includes('killed by  with')) s = await HandleKillfeed(this, guildId, s, lines[i]);
-      if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player')) s = await HandleKillfeed(this, guildId, s, lines[i]);
+      if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player') && lines[i].includes('hit by Player')) s = await HandleKillfeed(this, guildId, s, lines[i]);
+      if (lines[i].includes('killed by Player')) s = await HandleKillfeed(this, guildId, s, lines[i]);
     }
 
     const playerTemplate = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)/g;
diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js
index e60e37d..bc9b57c 100644
--- a/util/KillfeedHandler.js
+++ b/util/KillfeedHandler.js
@@ -9,13 +9,20 @@ module.exports = {
     let guild = await client.GetGuild(guildId);
     const channel = client.channels.cache.get(guild.killfeedChannel);
 
+    let templateKilled     = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\) killed by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) with (.*) from (.*) meters /g;
     let template           = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
     let templateDEAD       = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
     let explosionTemplate  = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\) killed by  with (.*)/g;
     
-    let killedByPlayer = line.includes('hit by Player') ? true : false;
+    let killedBy = line.includes('hit by Player') && line.includes('(DEAD)') ? 1 :
+                   line.includes('hit by Player') ? 2 :
+                   line.includes('killed by Player') ? 3 : 4;
+
+    let data = killedBy == 1 ? [...line.matchAll(templateDEAD)][0] : 
+               killedBy == 2 ? [...line.matchAll(template)][0] :
+               killedBy == 3 ? [...line.matchAll(templateKilled)][0] :
+               killedBy [...line.matchAll(explosionTemplate)][0];
 
-    let data = killedByPlayer && line.includes('(DEAD)') ? [...line.matchAll(templateDEAD)][0] : killedByPlayer ? [...line.matchAll(template)][0] : [...line.matchAll(explosionTemplate)][0];
     if (!data) return stats;
     
     // Create base data
@@ -27,7 +34,7 @@ module.exports = {
     }; 
 
     // Add additional data
-    if (killedByPlayer) {
+    if (killedBy == 1 || killedBy == 2) {
       info.killer    = data[6];
       info.killerID  = data[7];
       info.killerPOS = data[8];
@@ -36,6 +43,12 @@ module.exports = {
       info.bullet    = data[11];
       info.weapon    = data[12];
       info.distance  = data[13];
+    } else if (killedBy == 3) {
+      info.killer    = data[5];
+      info.killerID  = data[6];
+      info.killerPOS = data[7];
+      info.weapon    = data[8];
+      info.distance  = data[9];
     } else info.causeOfDeath = data[5];
 
     let newDt = await client.getDateEST(info.time);
@@ -132,7 +145,7 @@ module.exports = {
     
     const killEvent = new EmbedBuilder()
       .setColor(client.config.Colors.Default)
-      .setDescription(`**Kill Event** - <t:${unixTime}>\n**${info.killer}** killed **${info.victim}**\n> **__Kill Data__**\n> **Weapon:** \` ${info.weapon} \`\n> **Distance:** \` ${info.distance} \`\n> **Body Part:** \` ${info.bodyPart.split('(')[0]} \`\n> **Damage:** \` ${info.damage} \`\n **Killer\n${killerStat.KDR.toFixed(2)} K/D - ${killerStat.kills} Kills - Killstreak: ${killerStat.killStreak}\nVictim\n${victimStat.KDR.toFixed(2)} K/D - ${victimStat.deaths} Deaths - Deathstreak: ${victimStat.deathStreak}**`);
+      .setDescription(`**Kill Event** - <t:${unixTime}>\n**${info.killer}** killed **${info.victim}**\n> **__Kill Data__**\n> **Weapon:** \` ${info.weapon} \`\n> **Distance:** \` ${info.distance} \`\n> **Body Part:** \` ${info.bodyPart != undefined ? info.bodyPart.split('(')[0] : 'N/A'} \`\n> **Damage:** \` ${info.damage != undefined ? info.damage : 'N/A'} \`\n **Killer\n${killerStat.KDR.toFixed(2)} K/D - ${killerStat.kills} Kills - Killstreak: ${killerStat.killStreak}\nVictim\n${victimStat.KDR.toFixed(2)} K/D - ${victimStat.deaths} Deaths - Deathstreak: ${victimStat.deathStreak}**`);
 
     if (client.exists(channel)) await channel.send({ embeds: [killEvent] });
     if (client.exists(receivedBounty) && client.exists(channel)) await channel.send({ content: `<@${killerStat.discordID}>`, embeds: [receivedBounty] });