From 5205e28c87de07e88924c988f7f242928c9af31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Rom=C3=A1n?= <kyradiscord@gmail.com>
Date: Sun, 17 Oct 2021 15:31:51 +0200
Subject: [PATCH] fix: register cooldown correctly

---
 src/lib/structures/Command.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib/structures/Command.ts b/src/lib/structures/Command.ts
index a33f431e0..c998c2355 100644
--- a/src/lib/structures/Command.ts
+++ b/src/lib/structures/Command.ts
@@ -231,18 +231,21 @@ export abstract class Command<T = Args, O extends CommandOptions = CommandOption
 	 * @param options The command options given from the constructor.
 	 */
 	protected parseConstructorPreConditionsCooldown(options: CommandOptions) {
-		const { cooldownLimit, cooldownDelay, cooldownScope, cooldownFilteredUsers } = options;
 		const { defaultCooldown } = this.container.client.options;
 
-		if ((defaultCooldown && !defaultCooldown.filteredCommands?.includes(this.name)) || (cooldownLimit && cooldownDelay)) {
+		// We will check for whether the command is filtered from the defaults, but we will allow overridden values to
+		// be set. If an overridden value is passed, it will have priority. Otherwise it will default to 0 if filtered
+		// (causing the precondition to not be registered) or the default value with a fallback to a single-use cooldown.
+		const filtered = defaultCooldown?.filteredCommands?.includes(this.name) ?? false;
+		const limit = options.cooldownLimit ?? (filtered ? 0 : defaultCooldown!.limit ?? 1);
+		const delay = options.cooldownDelay ?? (filtered ? 0 : defaultCooldown!.delay ?? 0);
+
+		if (limit && delay) {
+			const scope = options.cooldownScope ?? defaultCooldown?.scope ?? BucketScope.User;
+			const filteredUsers = options.cooldownFilteredUsers ?? defaultCooldown?.filteredUsers;
 			this.preconditions.append({
 				name: CommandPreConditions.Cooldown,
-				context: {
-					scope: cooldownScope ?? defaultCooldown?.scope ?? BucketScope.User,
-					limit: cooldownLimit ?? defaultCooldown?.limit ?? 1,
-					delay: cooldownDelay ?? defaultCooldown?.delay ?? 0,
-					filteredUsers: cooldownFilteredUsers ?? defaultCooldown?.filteredUsers
-				}
+				context: { scope, limit, delay, filteredUsers }
 			});
 		}
 	}