Merge branch 'Garlic-Team:next' into feat/improve-jsdocs

Garlic-Team · Apr 18, 2022 · fffb381 · fffb381
2 parents 875fcf9 + 1bba379
commit fffb381
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 92 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,8 +66,8 @@
     "@types/keyv": "3.1.4",
     "@types/lru-cache": "7.6.1",
     "@types/node": "16.11.27",
-    "@typescript-eslint/eslint-plugin": "5.19.0",
-    "@typescript-eslint/parser": "5.19.0",
+    "@typescript-eslint/eslint-plugin": "5.20.0",
+    "@typescript-eslint/parser": "5.20.0",
     "conventional-changelog-cli": "2.2.2",
     "discord.js": "13.6.0",
     "eslint": "8.13.0",

diff --git a/src/handlers/ComponentHandler.ts b/src/handlers/ComponentHandler.ts
@@ -37,12 +37,12 @@ export async function ComponentHandler(
 		if (cooldown) {
 			return interaction.reply({
 				content: (await Util.getResponse('COOLDOWN', interaction))
-					.replace('{time}', String(cooldown))
-					.replace(
-						'{name}',
-						component.name +
-							(interaction.isButton() ? ' button' : ' select menu'),
-					),
+					/**
+					 * @deprecated Use {duration} instead
+					 */
+					.replaceAll('{time}', String(cooldown))
+					.replaceAll('{duration}', String(cooldown))
+					.replaceAll('{name}', component.name),
 				ephemeral: true,
 			});
 		}

diff --git a/src/handlers/InteractionCommandHandler.ts b/src/handlers/InteractionCommandHandler.ts
@@ -36,8 +36,12 @@ export async function InteractionCommandHandler(
 		if (cooldown) {
 			return interaction.reply({
 				content: (await Util.getResponse('COOLDOWN', interaction))
-					.replace('{time}', String(cooldown))
-					.replace('{name}', `${command.name} command`),
+					/**
+					 * @deprecated Use {duration} instead
+					 */
+					.replaceAll('{time}', String(cooldown))
+					.replaceAll('{duration}', String(cooldown))
+					.replaceAll('{name}', command.name),
 				ephemeral: true,
 			});
 		}

diff --git a/src/handlers/MessageCommandHandler.ts b/src/handlers/MessageCommandHandler.ts
@@ -162,8 +162,12 @@ export async function MessageCommandHandler(
 		if (cooldown) {
 			return message.reply({
 				content: (await Util.getResponse('COOLDOWN', { client }))
-					.replace('{time}', String(cooldown))
-					.replace('{name}', `${command.name} command`),
+					/**
+					 * @deprecated Use {duration} instead
+					 */
+					.replaceAll('{time}', String(cooldown))
+					.replaceAll('{duration}', String(cooldown))
+					.replaceAll('{name}', command.name),
 			});
 		}
 	}