fix(commands:clear): bc command alias not working

onesoft-sudo · Nov 4, 2023 · 823c8a7 · 823c8a7
1 parent 3e54e51
commit 823c8a7
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,5 @@
+all:
+	$(MAKE) -C lib
+
+clean:	
+	$(MAKE) -C lib clean
diff --git a/src/commands/moderation/ClearCommand.ts b/src/commands/moderation/ClearCommand.ts
@@ -60,7 +60,8 @@ export default class ClearCommand extends Command {
             typeErrorMessage: "Please either specify a message count or user at position 1!",
             minValue: 0,
             maxValue: 100,
-            minMaxErrorMessage: "The message count must be a number between 0 to 100"
+            minMaxErrorMessage: "The message count must be a number between 0 to 100",
+            optional: true
         },
         {
             types: [ArgumentType.Integer],
@@ -111,7 +112,11 @@ export default class ClearCommand extends Command {
         );
 
     async execute(message: CommandMessage, context: BasicCommandContext): Promise<CommandReturn> {
-        const count: number | undefined = !context.isLegacy
+        const isPrimaryCommand = !context.isLegacy
+            ? !!context.options.data.find(option => option.name.startsWith("filter_"))
+            : context.argv[0].length > 2;
+
+        let count: number | undefined = !context.isLegacy
             ? context.options.getInteger("count") ?? undefined
             : typeof context.parsedNamedArgs.countOrUser === "number"
             ? context.parsedNamedArgs.countOrUser
@@ -123,6 +128,19 @@ export default class ClearCommand extends Command {
             ? context.parsedNamedArgs.countOrUser
             : undefined;
 
+        if (!count && count !== 0 && !user) {
+            if (isPrimaryCommand) {
+                return {
+                    __reply: true,
+                    content: `${this.emoji(
+                        "error"
+                    )} Please specify a user or message count, otherwise the system cannot determine how many messages to delete!`
+                };
+            } else {
+                count = 20;
+            }
+        }
+
         const channel: Channel | undefined = !context.isLegacy
             ? context.options.getChannel("channel") ?? undefined
             : context.parsedNamedArgs.channel ?? undefined;
@@ -134,13 +152,11 @@ export default class ClearCommand extends Command {
             };
         }
 
-        if (!count && count !== 0 && !user) {
-            return {
-                __reply: true,
-                content: `${this.emoji(
-                    "error"
-                )} Please specify a user or message count, otherwise the system cannot determine how many messages to delete!`
-            };
+        if (message instanceof ChatInputCommandInteraction) {
+            if (message.options.getString("filter_pattern_flags") && !message.options.getString("filter_pattern")) {
+                await this.error(message, `Option \`filter_pattern\` must be present when \`filter_pattern_flags\` is set.`);
+                return;
+            }
         }
 
         if (user) {
@@ -193,16 +209,14 @@ export default class ClearCommand extends Command {
                     }
                 }
             }
+        } else if (context.isLegacy) {
+            const aliasHandlerName = filter_aliases[context.argv[0]];
 
-            if (context.isLegacy) {
-                const aliasHandlerName = filter_aliases[context.argv[0]];
-
-                if (aliasHandlerName) {
-                    const aliasHandler = filters[aliasHandlerName];
+            if (aliasHandlerName) {
+                const aliasHandler = filters[aliasHandlerName];
 
-                    if (aliasHandler) {
-                        filterHandlers.push(aliasHandler);
-                    }
+                if (aliasHandler) {
+                    filterHandlers.push(aliasHandler);
                 }
             }
         }

diff --git a/src/services/InfractionManager.ts b/src/services/InfractionManager.ts
@@ -610,11 +610,11 @@ export default class InfractionManager extends Service {
                     .catch(logError);
             }
 
-            if (!logOnly && messages && count > 0) {
+            if (!logOnly && messages) {
                 try {
                     await messageChannel.bulkDelete(messages);
                     const reply = await messageChannel.send(
-                        `${getEmoji(this.client, "check")} Deleted ${count} messages${
+                        `${getEmoji(this.client, "check")} Deleted ${messages.length} messages${
                             user ? ` from user **@${escapeMarkdown(user.username)}**` : ""
                         }`
                     );

diff --git a/src/services/LoggerService.ts b/src/services/LoggerService.ts
@@ -1142,7 +1142,7 @@ export default class LoggerService extends Service {
                     }
                 ]
             },
-            sendJSON
+            sendJSON && messages.length > 0
                 ? {
                       files: [
                           {
@@ -1154,24 +1154,26 @@ export default class LoggerService extends Service {
                 : undefined
         );
 
-        message
-            ?.edit({
-                embeds: [
-                    {
-                        ...(message?.embeds[0]?.data ?? {}),
-                        fields: [
-                            ...(message?.embeds[0].data.fields ?? []),
-                            {
-                                name: "Messages",
-                                value: `[Click here to view the deleted messages](${
-                                    process.env.FRONTEND_URL
-                                }/view_deleted_messages?url=${encodeURIComponent(message.attachments.at(0)!.url)})`
-                            }
-                        ]
-                    }
-                ]
-            })
-            .catch(logError);
+        if (messages.length > 0 && sendJSON) {
+            message
+                ?.edit({
+                    embeds: [
+                        {
+                            ...(message?.embeds[0]?.data ?? {}),
+                            fields: [
+                                ...(message?.embeds[0].data.fields ?? []),
+                                {
+                                    name: "Messages",
+                                    value: `[Click here to view the deleted messages](${
+                                        process.env.FRONTEND_URL
+                                    }/view_deleted_messages?url=${encodeURIComponent(message.attachments.at(0)!.url)})`
+                                }
+                            ]
+                        }
+                    ]
+                })
+                .catch(logError);
+        }
     }
 
     async logMemberUnmute({