From 9c73163ff3f36102d75b9a8e68f112d9562a9f65 Mon Sep 17 00:00:00 2001 From: ethanf Date: Tue, 5 Nov 2024 22:26:36 -0600 Subject: [PATCH] refactor: fk logging improvements --- commands/fk.js | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/commands/fk.js b/commands/fk.js index dbae675..7d0c7b9 100644 --- a/commands/fk.js +++ b/commands/fk.js @@ -85,12 +85,9 @@ const execute = async (interaction) => { picking.members.forEach((member) => pickingPlayers.push(member)); if (pickingPlayers.length < addupPlayers.length) { - // move all addup into empty picking - addup.members.forEach((member) => { - member.voice.setChannel(picking); - }); + return await interaction.followUp( - "Found too few players in picking to fatkid, moved all addup players to picking instead" + "Found more players in addup than picking" ); } @@ -199,27 +196,23 @@ const execute = async (interaction) => { let fkStr = `Sat out ${fatkids.length} players${ fatkids.length > 0 ? ": " : "" }`; - for (const fk of fatkids) { - fkStr += `${fk.displayName}, `; - } - fkStr = fkStr.slice(0, -2); + fkStr.concat(fk.map((fk) => fk.displayName).join(", ")); if (Object.keys(protectedDict).length > 0) { - fkStr += "Players that were protected at least once: "; + let protectedArr = []; + fkStr.concat("\nPlayers that were protected at least once: "); for (const fkId in protectedDict) { await interaction.guild.members .fetch(fkId) .then((member) => { - if (member) { - fkStr += `${member.displayName}, `; - } + protectedArr.push(member.displayName); }) .catch(console.error); } - fkStr = fkStr.slice(0, -2); + fkStr.concat(protectedArr.join(", ")); } if (fkAttempts > 100) - fkStr += `\n(fk protection sets ignored: ${3 - recentFkSets.length}/3)`; - if (errCount > 0) fkStr += `\n(error moving ${errCount} members)`; + fkStr.concat(`\n(fk protection sets ignored: ${3 - recentFkSets.length}/3)`); + if (errCount > 0) fkStr.concat(`\n(error moving ${errCount} members)`); interaction.followUp(fkStr); };