Merge branch 'main' into js-5624932

.github/workflows/gen-list.yml

@@ -1,9 +1,6 @@
 name: "Generate Plugin Listing"
 
 on:
-  push:
-    branches:
-      main
   workflow_dispatch:
 
 jobs:

TypeScript/disable.ts

@@ -3,7 +3,8 @@
  * Disables a command entirely, for whatever reasons you may need.
  *
  * @author @jacoobes [<@182326315813306368>]
- * @version 1.0.0
+ * @author @Peter-MJ-Parker [<@1017182455926624316>]
+ * @version 2.0.0
  * @example
  * ```ts
  * import { disable } from "../plugins/disable";
@@ -16,23 +17,53 @@
  * })
  * ```
  */
-import { CommandType, EventPlugin, PluginType } from "@sern/handler";
-import { InteractionReplyOptions, ReplyMessageOptions } from "discord.js";
+import { CommandType, CommandControlPlugin, controller } from "@sern/handler";
+import {
+	InteractionReplyOptions,
+	Message,
+	ReplyMessageOptions,
+} from "discord.js";
 
 export function disable(
 	onFail?:
 		| string
 		| Omit<InteractionReplyOptions, "fetchReply">
 		| ReplyMessageOptions
-): EventPlugin<CommandType.Both> {
-	return {
-		type: PluginType.Event,
-		description: "Disables command from responding",
-		async execute([ctx], controller) {
-			if (onFail !== undefined) {
-				await ctx.reply(onFail);
+) {
+	return CommandControlPlugin<CommandType.Both>(async (ctx, [args]) => {
+		if (onFail !== undefined) {
+			switch (args) {
+				case "text":
+					//reply to text command
+					const msg = await ctx.reply(onFail);
+					setTimeout(() => {
+						//deletes the bots reply to the user
+						msg.delete();
+						//deletes the original authors message (text command).
+						ctx.message.delete();
+						//waits 5 seconds before deleting messages
+					}, 5000).catch((e) => {
+						//logs error to console (if any).
+						console.log(e);
+					});
+
+					break;
+
+				case "slash":
+					//ephemeral response to say the command is disabled with users response.
+					await ctx.reply({ content: onFail, ephemeral: true });
+					break;
+
+				default:
+					break;
 			}
-			return controller.stop();
-		},
-	};
+		}
+		//this function tells the bot to reply to an interaction so it doesn't seem like it fails (in case there is no onFail message).
+		if (onFail === undefined && args === "slash") {
+			onFail = "This command is disabled.";
+			await ctx.reply({ content: onFail, ephemeral: true });
+		}
+		//stop the command from running
+		return controller.stop();
+	});
 }