feat: add /anonmacro command

oliverbooth · oliverbooth · commit d8a6456abfeb · 2025-08-24T13:34:09.000+01:00
diff --git a/Marco/Commands/MacroCommand.cs b/Marco/Commands/MacroCommand.cs
@@ -23,28 +23,39 @@ public MacroCommand(MacroService macroService, MacroCooldownService cooldownServ
         _cooldownService = cooldownService;
     }
 
-    [SlashCommand("macro", "Executes a macro.")]
+    [SlashCommand("anonmacro", "Executes an macro anonymously, hiding the invocation.", false)]
     [SlashRequireGuild]
-    public async Task MacroAsync(InteractionContext context,
-        [Option("macro", "The name of the macro.", true)] [Autocomplete(typeof(MacroAutocompleteProvider))]
-        string macroName)
+    public async Task AnonymousMacroAsync(InteractionContext context,
+        [Option("macro", "The name of the macro.", true)] [Autocomplete(typeof(MacroAutocompleteProvider))] string macroName)
     {
-        if (!_macroService.TryGetMacro(context.Guild, macroName, out Macro? macro))
+        Macro? macro = await VerifyMacroAsync(context, macroName);
+        if (macro is null)
         {
-            await context.CreateResponseAsync($"The macro `{macroName}` doesn't exist.", true).ConfigureAwait(false);
             return;
         }
 
-        DiscordChannel channel = context.Channel;
+        var builder = new DiscordMessageBuilder();
+        string response = macro.Response;
 
-        if (macro.ChannelId.HasValue && macro.ChannelId.Value != channel.Id)
+        if (response.StartsWith("@silent "))
         {
-            await context.CreateResponseAsync($"The macro `{macroName}` cannot be executed here.", true).ConfigureAwait(false);
-            return;
+            response = response[8..];
+            builder.SuppressNotifications();
         }
-        if (_cooldownService.IsOnCooldown(channel, macro))
+
+        builder.WithContent(response);
+        await context.CreateResponseAsync("The macro has been sent.", true).ConfigureAwait(false);
+        await context.Channel.SendMessageAsync(builder).ConfigureAwait(false);
+    }
+
+    [SlashCommand("macro", "Executes a macro.")]
+    [SlashRequireGuild]
+    public async Task MacroAsync(InteractionContext context,
+        [Option("macro", "The name of the macro.", true)] [Autocomplete(typeof(MacroAutocompleteProvider))] string macroName)
+    {
+        Macro? macro = await VerifyMacroAsync(context, macroName);
+        if (macro is null)
         {
-            await context.CreateResponseAsync($"The macro `{macroName}` is on cooldown because it was very recently executed.", true).ConfigureAwait(false);
             return;
         }
 
@@ -59,6 +70,33 @@ public async Task MacroAsync(InteractionContext context,
 
         builder.WithContent(response);
         await context.CreateResponseAsync(builder).ConfigureAwait(false);
-        _cooldownService.UpdateCooldown(channel, macro);
+        _cooldownService.UpdateCooldown(context.Channel, macro);
+    }
+
+    private async Task<Macro?> VerifyMacroAsync(InteractionContext context, string macroName)
+    {
+        if (!_macroService.TryGetMacro(context.Guild, macroName, out Macro? macro))
+        {
+            await context.CreateResponseAsync($"The macro `{macroName}` doesn't exist.", true).ConfigureAwait(false);
+            return null;
+        }
+
+        DiscordChannel channel = context.Channel;
+
+        if (macro.ChannelId.HasValue && macro.ChannelId.Value != channel.Id)
+        {
+            await context.CreateResponseAsync($"The macro `{macroName}` cannot be executed here.", true).ConfigureAwait(false);
+            return null;
+        }
+
+        if (_cooldownService.IsOnCooldown(channel, macro))
+        {
+            await context
+                .CreateResponseAsync($"The macro `{macroName}` is on cooldown because it was very recently executed.", true)
+                .ConfigureAwait(false);
+            return null;
+        }
+
+        return macro;
     }
 }
