From b8ffa9fd941670053e4a42913193a5bd2625c246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Gro=C3=9F?= <git@minzkraut.com>
Date: Wed, 15 Mar 2023 11:23:58 +0100
Subject: [PATCH] Drop: Fix for patreon perks not applying same as in 3d1ed01
 We also move up the action handler hoping that persisting early helps with
 multiple drops happening quickly

---
 commands/drop.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/commands/drop.js b/commands/drop.js
index d78ecb0..8530e61 100644
--- a/commands/drop.js
+++ b/commands/drop.js
@@ -15,7 +15,7 @@ module.exports = {
         const user = await UserUtils.getUserByDiscordId(interaction.member.id);
         
         let permissionLevel = await UserUtils.getPermissionLevel(interaction.member);
-        const cooldowns = await UserUtils.getCooldowns(user);
+        const cooldowns = await UserUtils.getCooldowns(user, (await UserUtils.getPatreonPerks(interaction.client, user))['tier']);
 
         //Can't drop if no drops remain    nextReset hasn't been reached   User is not a global admin
         if (cooldowns.remainingDrops <= 0 && cooldowns.nextDropReset > 0 && permissionLevel < 2) {
@@ -25,7 +25,9 @@ module.exports = {
             });
             return;
         }
-
+        
+        await UserUtils.actionHandler(user, "drop");
+        
         //Generate 3 cards, each is persisted with an initial userId of NULL
         const cards = [];
         let characters = await Character.findAll({
@@ -119,7 +121,6 @@ module.exports = {
             type: 0
         });
 
-        await UserUtils.actionHandler(user, "drop");
 
         const collector = message.createMessageComponentCollector({ componentType: ComponentType.Button, time: 60000 });