DSharpPlus · VelvetToroyashi · Jan 28, 2023 · Jul 28, 2022 · Aug 5, 2022 · Aug 5, 2022
diff --git a/DSharpPlus.CommandsNext/Attributes/CategoryAttribute.cs b/DSharpPlus.CommandsNext/Attributes/CategoryAttribute.cs
@@ -0,0 +1,43 @@
+// This file is part of the DSharpPlus project.
+//
+// Copyright (c) 2015 Mike Santiago
+// Copyright (c) 2016-2022 DSharpPlus Contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DSharpPlus.CommandsNext.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    public sealed class CategoryAttribute : Attribute
+    {
+        public string? Name { get; }
+
+        public CategoryAttribute(string? name)
+        {
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentNullException(nameof(name), "Command category names cannot be null, empty, or all-whitespace.");
+
+            this.Name = name;
+        }
+    }
+}
diff --git a/DSharpPlus.CommandsNext/CommandsNextExtension.cs b/DSharpPlus.CommandsNext/CommandsNextExtension.cs
@@ -589,6 +589,10 @@ private void RegisterCommands(Type t, CommandGroupBuilder? currentParent, IEnume
                             commandBuilder.WithHiddenStatus(true);
                             break;
 
+                        case CategoryAttribute c:
+                            commandBuilder.WithCategory(c.Name);
+                            break;
+
                         default:
                             commandBuilder.WithCustomAttribute(xa);
                             break;

diff --git a/DSharpPlus.CommandsNext/Converters/DefaultHelpFormatter.cs b/DSharpPlus.CommandsNext/Converters/DefaultHelpFormatter.cs
@@ -98,7 +98,21 @@ public override BaseHelpFormatter WithCommand(Command command)
         /// <returns>This help formatter.</returns>
         public override BaseHelpFormatter WithSubcommands(IEnumerable<Command> subcommands)
         {
-            this.EmbedBuilder.AddField(this.Command is not null ? "Subcommands" : "Commands", string.Join(", ", subcommands.Select(x => Formatter.InlineCode(x.Name))), false);
+
+            var categories = subcommands.GroupBy(xm => xm.Category).OrderBy(xm => xm.Key == null).ThenBy(xm => xm.Key);
+
+            // no known categories, proceed without categorization
+            if (categories.Count() == 1 && categories.Single().Key == null)
+            {
+                this.EmbedBuilder.AddField(this.Command is not null ? "Subcommands" : "Commands", string.Join(", ", subcommands.Select(x => Formatter.InlineCode(x.Name))), false);
+
+                return this;
+            }
+
+            foreach (var category in categories)
+            {
+                this.EmbedBuilder.AddField(category.Key ?? "Uncategorized commands", string.Join(", ", category.Select(xm => Formatter.InlineCode(xm.Name))), false);
+            }
 
             return this;
         }

diff --git a/DSharpPlus.CommandsNext/Entities/Builders/CommandBuilder.cs b/DSharpPlus.CommandsNext/Entities/Builders/CommandBuilder.cs
@@ -41,6 +41,11 @@ public class CommandBuilder
         /// </summary>
         public string Name { get; private set; } = null!;
 
+        /// <summary>
+        /// Gets the category set for this command.
+        /// </summary>
+        public string? Category { get; private set; }
+
         /// <summary>
         /// Gets the aliases set for this command.
         /// </summary>
@@ -126,6 +131,17 @@ public CommandBuilder WithName(string name)
             return this;
         }
 
+        /// <summary>
+        /// Sets the category for this command.
+        /// </summary>
+        /// <param name="category">Category for this command. May be <see langword="null"/>.</param>
+        /// <returns>This builder.</returns>
+        public CommandBuilder WithCategory(string? category)
+        {
+            this.Category = category;
+            return this;
+        }
+
         /// <summary>
         /// Adds aliases to this command.
         /// </summary>
@@ -265,6 +281,7 @@ internal virtual Command Build(CommandGroup? parent)
                     ? throw new InvalidOperationException($"Cannot build a command with an invalid name. Use the method {nameof(this.WithName)} to set a valid name.")
                     : this.Name,
 
+                Category = this.Category,
                 Description = this.Description,
                 Aliases = this.Aliases,
                 ExecutionChecks = this.ExecutionChecks,

diff --git a/DSharpPlus.CommandsNext/Entities/Command.cs b/DSharpPlus.CommandsNext/Entities/Command.cs
@@ -40,6 +40,11 @@ public class Command
         /// </summary>
         public string Name { get; internal set; } = string.Empty;
 
+        /// <summary>
+        /// Gets the category this command belongs to.
+        /// </summary>
+        public string? Category { get; internal set; } = null;
+
         /// <summary>
         /// Gets this command's qualified name (i.e. one that includes all module names).
         /// </summary>

diff --git a/DSharpPlus.MSTest/DSharpPlus.MSTest.csproj b/DSharpPlus.MSTest/DSharpPlus.MSTest.csproj
diff --git a/DSharpPlus.MSTest/TestJson.cs b/DSharpPlus.MSTest/TestJson.cs
diff --git a/DSharpPlus.SlashCommands/Attributes/ParameterLimitAttribute.cs b/DSharpPlus.SlashCommands/Attributes/ParameterLimitAttribute.cs
@@ -0,0 +1,62 @@
+// This file is part of the DSharpPlus project.
+//
+// Copyright (c) 2015 Mike Santiago
+// Copyright (c) 2016-2022 DSharpPlus Contributors
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+using System;
+
+namespace DSharpPlus.SlashCommands.Attributes
+{
+    /// <summary>
+    /// Intended to be used in conjunction on parameters marked with <see langword="params"/>, this attribute will limit the amount of elements in the array.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = true, AllowMultiple = false)]
+    public sealed class ParameterLimitAttribute : Attribute
+    {
+        /// <summary>
+        /// The minimum amount of elements required in the parameter array.
+        /// </summary>
+        public readonly int Min;
+
+        /// <summary>
+        /// The maximum amount of elements allowed in the parameter array.
+        /// </summary>
+        public readonly int Max;
+
+        /// <summary>
+        /// Intended to be used in conjunction on parameters marked with <see langword="params"/>, this attribute will limit the amount of elements in the array.
+        /// </summary>
+        /// <param name="min">The minimum amount of elements required in the parameter array.</param>
+        /// <param name="max">The maximum amount of elements allowed in the parameter array.</param>
+        public ParameterLimitAttribute(int min, int max)
+        {
+            if (min < 0 || min > 25)
+                throw new ArgumentException("Minimum must be between 0 and 25 inclusive.", nameof(min));
+            else if (max < 1 || max > 25)
+                throw new ArgumentException("Maximum must be between 1 and 25 inclusive.", nameof(max));
+            else if (min > max)
+                throw new ArgumentException("Minimum cannot be greater than maximum.", nameof(min));
+
+            this.Min = min;
+            this.Max = max;
+        }
+    }
+}