Allow application command aliases by using multiple attributes

NetCordDev · Dec 10, 2023 · feefc67 · feefc67
1 parent 51b776e
commit feefc67
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 19 deletions.
diff --git a/NetCord.Services/ApplicationCommands/ApplicationCommandAttribute.cs b/NetCord.Services/ApplicationCommands/ApplicationCommandAttribute.cs
@@ -2,7 +2,7 @@
 
 namespace NetCord.Services.ApplicationCommands;
 
-[AttributeUsage(AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
 public abstract class ApplicationCommandAttribute : Attribute
 {
     private protected ApplicationCommandAttribute(string name)

diff --git a/NetCord.Services/ApplicationCommands/ApplicationCommandService.cs b/NetCord.Services/ApplicationCommands/ApplicationCommandService.cs
@@ -73,31 +73,35 @@ private void AddModuleCore([DynamicallyAccessedMembers(DynamicallyAccessedMember
     {
         var configuration = _configuration;
 
-        var slashCommandAttribute = type.GetCustomAttribute<SlashCommandAttribute>();
-        if (slashCommandAttribute is not null)
+        bool slashCommandGroup = false;
+
+        foreach (var slashCommandAttribute in type.GetCustomAttributes<SlashCommandAttribute>())
         {
             SlashCommandGroupInfo<TContext> slashCommandGroupInfo = new(type, slashCommandAttribute, configuration);
             OnAutocompleteAdd(slashCommandGroupInfo);
             AddCommandInfo(slashCommandGroupInfo);
+
+            slashCommandGroup = true;
         }
-        else
+
+        if (slashCommandGroup)
+            return;
+
+        foreach (var method in type.GetMethods())
         {
-            foreach (var method in type.GetMethods())
+            foreach (var applicationCommandAttribute in method.GetCustomAttributes<ApplicationCommandAttribute>())
             {
-                slashCommandAttribute = method.GetCustomAttribute<SlashCommandAttribute>();
-                if (slashCommandAttribute is not null)
+                if (applicationCommandAttribute is SlashCommandAttribute slashCommandAttribute)
                 {
                     SlashCommandInfo<TContext> slashCommandInfo = new(method, type, slashCommandAttribute, configuration);
                     OnAutocompleteAdd(slashCommandInfo);
                     AddCommandInfo(slashCommandInfo);
                 }
 
-                var userCommandAttribute = method.GetCustomAttribute<UserCommandAttribute>();
-                if (userCommandAttribute is not null)
+                if (applicationCommandAttribute is UserCommandAttribute userCommandAttribute)
                     AddCommandInfo(new UserCommandInfo<TContext>(method, type, userCommandAttribute, configuration));
 
-                var messageCommandAttribute = method.GetCustomAttribute<MessageCommandAttribute>();
-                if (messageCommandAttribute is not null)
+                if (applicationCommandAttribute is MessageCommandAttribute messageCommandAttribute)
                     AddCommandInfo(new MessageCommandInfo<TContext>(method, type, messageCommandAttribute, configuration));
             }
         }

diff --git a/NetCord.Services/ApplicationCommands/SlashCommandAttribute.cs b/NetCord.Services/ApplicationCommands/SlashCommandAttribute.cs
@@ -2,7 +2,7 @@
 
 namespace NetCord.Services.ApplicationCommands;
 
-[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
 public class SlashCommandAttribute : ApplicationCommandAttribute
 {
     public SlashCommandAttribute(string name, string description) : base(name)

diff --git a/NetCord.Services/ApplicationCommands/SlashCommandGroupInfo.cs b/NetCord.Services/ApplicationCommands/SlashCommandGroupInfo.cs
@@ -33,8 +33,7 @@ internal SlashCommandGroupInfo([DynamicallyAccessedMembers(DynamicallyAccessedMe
 
         foreach (var method in type.GetMethods())
         {
-            var subSlashCommandAttribute = method.GetCustomAttribute<SubSlashCommandAttribute>();
-            if (subSlashCommandAttribute is not null)
+            foreach (var subSlashCommandAttribute in method.GetCustomAttributes<SubSlashCommandAttribute>())
                 subCommands.Add(subSlashCommandAttribute.Name!, new SubSlashCommandInfo<TContext>(method, type, subSlashCommandAttribute, configuration));
         }
 
@@ -44,8 +43,7 @@ internal SlashCommandGroupInfo([DynamicallyAccessedMembers(DynamicallyAccessedMe
             if (!nested.IsAssignableTo(baseType))
                 continue;
 
-            var subSlashCommandAttribute = nested.GetCustomAttribute<SubSlashCommandAttribute>();
-            if (subSlashCommandAttribute is not null)
+            foreach (var subSlashCommandAttribute in nested.GetCustomAttributes<SubSlashCommandAttribute>())
                 subCommands.Add(subSlashCommandAttribute.Name!, new SubSlashCommandGroupInfo<TContext>(nested, subSlashCommandAttribute, configuration));
         }
 

diff --git a/NetCord.Services/ApplicationCommands/SubSlashCommandAttribute.cs b/NetCord.Services/ApplicationCommands/SubSlashCommandAttribute.cs
@@ -2,7 +2,7 @@
 
 namespace NetCord.Services.ApplicationCommands;
 
-[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)]
 public class SubSlashCommandAttribute : Attribute
 {
     public SubSlashCommandAttribute(string name, string description)

diff --git a/NetCord.Services/ApplicationCommands/SubSlashCommandGroupInfo.cs b/NetCord.Services/ApplicationCommands/SubSlashCommandGroupInfo.cs
@@ -28,8 +28,7 @@ internal SubSlashCommandGroupInfo([DynamicallyAccessedMembers(DynamicallyAccesse
 
         foreach (var method in type.GetMethods())
         {
-            var subSlashCommandAttribute = method.GetCustomAttribute<SubSlashCommandAttribute>();
-            if (subSlashCommandAttribute is not null)
+            foreach (var subSlashCommandAttribute in method.GetCustomAttributes<SubSlashCommandAttribute>())
                 subCommands.Add(subSlashCommandAttribute.Name!, new SubSlashCommandInfo<TContext>(method, type, subSlashCommandAttribute, configuration));
         }
 

diff --git a/Tests/NetCord.Test/ApplicationCommands/Commands.cs b/Tests/NetCord.Test/ApplicationCommands/Commands.cs
@@ -8,9 +8,11 @@
 
 namespace NetCord.Test.SlashCommands;
 
+[SlashCommand("pn", "PN")]
 [SlashCommand("permission-nested", "Permission")]
 public class NestedCommand : ApplicationCommandModule<SlashCommandContext>
 {
+    [SubSlashCommand("a", "A")]
     [SubSlashCommand("add", "Permission add")]
     public Task AddAsync(int i, Permissions permission)
     {
@@ -23,9 +25,11 @@ public static InteractionCallback Remove(int i, Permissions permission)
         return InteractionCallback.Message(permission.ToString());
     }
 
+    [SubSlashCommand("l", "L")]
     [SubSlashCommand("list", "Permission list")]
     public class ListCommand : ApplicationCommandModule<SlashCommandContext>
     {
+        [SubSlashCommand("u", "U")]
         [SubSlashCommand("user", "Permission list user")]
         public static InteractionCallback User(int i, Permissions permission)
         {
@@ -114,6 +118,7 @@ public async Task PlayAsync()
         //voiceClient.VoiceReceive += args => outputStream.WriteAsync(args.Frame);
     }
 
+    [SlashCommand("c", "C")]
     [SlashCommand("channel", "Channel")]
     public Task ChannelAsync(TextChannel channel)
     {

diff --git a/Tests/NetCord.Test/ApplicationCommands/MessageCommands.cs b/Tests/NetCord.Test/ApplicationCommands/MessageCommands.cs
@@ -5,6 +5,7 @@ namespace NetCord.Test.ApplicationCommands;
 
 public class MessageCommands : ApplicationCommandModule<MessageCommandContext>
 {
+    [MessageCommand("Clear", DMPermission = false, DefaultGuildUserPermissions = Permissions.ManageMessages)]
     [MessageCommand("Clear to this", DMPermission = false, DefaultGuildUserPermissions = Permissions.ManageMessages)]
     public async Task ClearToAsync()
     {

diff --git a/Tests/NetCord.Test/ApplicationCommands/UserCommands.cs b/Tests/NetCord.Test/ApplicationCommands/UserCommands.cs
@@ -5,6 +5,7 @@ namespace NetCord.Test.ApplicationCommands;
 
 public class UserCommands : ApplicationCommandModule<UserCommandContext>
 {
+    [UserCommand("Get ID")]
     [UserCommand("Get id")]
     public Task GetId()
         => RespondAsync(InteractionCallback.Message(Context.Target.Id.ToString()!));