moving check to Preconditions

src/Discord.Net.Core/Entities/Interactions/SlashCommands/SlashCommandBuilder.cs

@@ -164,24 +164,13 @@ namespace Discord
            string description, bool? isRequired = null, bool? isDefault = null, bool isAutocomplete = false, double? minValue = null, double? maxValue = null,
            List<SlashCommandOptionBuilder> options = null, List<ChannelType> channelTypes = null, params ApplicationCommandOptionChoiceProperties[] choices)
         {
-            // Make sure the name matches the requirements from discord
-            Preconditions.NotNullOrEmpty(name, nameof(name));
-            Preconditions.NotNullOrEmpty(description, nameof(description));
-            Preconditions.AtLeast(name.Length, 1, nameof(name));
-            Preconditions.AtMost(name.Length, MaxNameLength, nameof(name));
-            Preconditions.AtLeast(description.Length, 1, nameof(description));
-            Preconditions.AtMost(description.Length, MaxDescriptionLength, nameof(description));
+            Preconditions.Options(name, description);
 
             // Discord updated the docs, this regex prevents special characters like @!$%( and s p a c e s.. etc,
             // https://discord.com/developers/docs/interactions/slash-commands#applicationcommand
             if (!Regex.IsMatch(name, @"^[\w-]{1,32}$"))
                 throw new ArgumentException("Command name cannot contain any special characters or whitespaces!", nameof(name));
 
-            // same with description
-            Preconditions.NotNullOrEmpty(description, nameof(description));
-            Preconditions.AtLeast(description.Length, 1, nameof(description));
-            Preconditions.AtMost(description.Length, MaxDescriptionLength, nameof(description));
-
             // make sure theres only one option with default set to true
             if (isDefault == true && Options?.Any(x => x.IsDefault == true) == true)
                 throw new ArgumentException("There can only be one command option with default set to true!", nameof(isDefault));
@@ -217,6 +206,7 @@ namespace Discord
                 throw new InvalidOperationException($"Cannot have more than {MaxOptionsCount} options!");
 
             Preconditions.NotNull(option, nameof(option));
+            Preconditions.Options(option.Name, option.Description); // this is a double-check when this method is called via AddOption(string name... )
 
             Options.Add(option);
             return this;
@@ -239,6 +229,9 @@ namespace Discord
             if (Options.Count + options.Length > MaxOptionsCount)
                 throw new ArgumentOutOfRangeException(nameof(options), $"Cannot have more than {MaxOptionsCount} options!");
 
+            foreach (var option in options)
+                Preconditions.Options(option.Name, option.Description);
+
             Options.AddRange(options);
             return this;
         }
@@ -382,7 +375,7 @@ namespace Discord
                 MinValue = MinValue,
                 MaxValue = MaxValue
             };
-        }
+        }        
 
         /// <summary>
         ///     Adds an option to the current slash command.
@@ -403,24 +396,13 @@ namespace Discord
            string description, bool? isRequired = null, bool isDefault = false, bool isAutocomplete = false, double? minValue = null, double? maxValue = null,
            List<SlashCommandOptionBuilder> options = null, List<ChannelType> channelTypes = null, params ApplicationCommandOptionChoiceProperties[] choices)
         {
-            // Make sure the name matches the requirements from discord
-            Preconditions.NotNullOrEmpty(name, nameof(name));
-            Preconditions.NotNullOrEmpty(description, nameof(description));
-            Preconditions.AtLeast(name.Length, 1, nameof(name));
-            Preconditions.AtMost(name.Length, SlashCommandBuilder.MaxNameLength, nameof(name));
-            Preconditions.AtLeast(description.Length, 1, nameof(description));
-            Preconditions.AtMost(description.Length, SlashCommandBuilder.MaxDescriptionLength, nameof(description));
+            Preconditions.Options(name, description);
 
             // Discord updated the docs, this regex prevents special characters like @!$%( and s p a c e s.. etc,
             // https://discord.com/developers/docs/interactions/slash-commands#applicationcommand
             if (!Regex.IsMatch(name, @"^[\w-]{1,32}$"))
                 throw new ArgumentException("Command name cannot contain any special characters or whitespaces!", nameof(name));
 
-            // same with description
-            Preconditions.NotNullOrEmpty(description, nameof(description));
-            Preconditions.AtLeast(description.Length, 1, nameof(description));
-            Preconditions.AtMost(description.Length, SlashCommandBuilder.MaxDescriptionLength, nameof(description));
-
             // make sure theres only one option with default set to true
             if (isDefault && Options?.Any(x => x.IsDefault == true) == true)
                 throw new ArgumentException("There can only be one command option with default set to true!", nameof(isDefault));
@@ -455,6 +437,7 @@ namespace Discord
                 throw new InvalidOperationException($"There can only be {SlashCommandBuilder.MaxOptionsCount} options per sub command group!");
 
             Preconditions.NotNull(option, nameof(option));
+            Preconditions.Options(option.Name, option.Description); // double check again
 
             Options.Add(option);
             return this;

src/Discord.Net.Core/Utils/Preconditions.cs

@@ -297,5 +297,20 @@ namespace Discord
             }
         }
         #endregion
+
+        #region SlashCommandOptions
+
+        public static void Options(string name, string description)
+        {
+            // Make sure the name matches the requirements from discord
+            NotNullOrEmpty(name, nameof(name));
+            NotNullOrEmpty(description, nameof(description));
+            AtLeast(name.Length, 1, nameof(name));
+            AtMost(name.Length, SlashCommandBuilder.MaxNameLength, nameof(name));
+            AtLeast(description.Length, 1, nameof(description));
+            AtMost(description.Length, SlashCommandBuilder.MaxDescriptionLength, nameof(description));
+        }
+
+        #endregion
     }
 }