From 147cb1553db5e6fb13af70741fd97bbca20e2cec Mon Sep 17 00:00:00 2001
From: Minzkraut <git@minzkraut.com>
Date: Mon, 13 Mar 2023 03:31:20 +0100
Subject: [PATCH] Cooldowns: Add support for new Patreon multi drops/pickups
 Also include <t:> timestamp for Daily reset date

---
 commands/cooldowns.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/commands/cooldowns.js b/commands/cooldowns.js
index 8b357b6..fbca5b7 100644
--- a/commands/cooldowns.js
+++ b/commands/cooldowns.js
@@ -13,14 +13,25 @@ module.exports = {
         const user = await UserUtils.getUserByDiscordId(interaction.member.id);
 
         //get user cooldowns using user utils
-        const cooldowns = await UserUtils.getCooldowns(user);
+        const cooldowns = await UserUtils.getCooldowns(user, (await UserUtils.getPatreonPerks(interaction.client, user))['tier']);
 
         let reply = "Cooldowns:\n";
-        for (cooldown in cooldowns) {
-            //if cooldown contains the string formatted 
-            if (cooldown.includes("Formatted")) {
-                reply += `${cooldowns[cooldown]}\n`;
-            }
+        if (cooldowns.remainingDrops > 0) {
+            reply += `Drop: ${cooldowns.remainingDrops} remaining\n`;
+        } else {
+            reply += `Drop: Resets in ${cooldowns.nextDropResetFormatted}\n`;
+        }
+        
+        if (cooldowns.remainingClaims > 0) {
+            reply += `Claim: ${cooldowns.remainingClaims} remaining\n`;
+        } else {
+            reply += `Claim: Resets in ${cooldowns.nextClaimResetFormatted}\n`;
+        }
+
+        if (cooldowns.nextDaily > 0) {
+            reply += `Daily: ${cooldowns.nextDailyFormatted}\n`;
+        } else {
+            reply += `Daily: Ready!\n`;
         }
 
         interaction.reply({