github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NullReferenceException caused by Options being undefined. (#2549)

Browse Source
This commit is contained in:
Gediminas Milašius
2023-01-21 12:48:36 +02:00
committed by GitHub
parent 4aded83ab6
commit 02d3ce6e01
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Core/Entities/Interactions/SlashCommands/SlashCommandBuilder.cs
View File

@@ -664,7 +664,9 @@ namespace Discord
if (options == null) if (options == null)
throw new ArgumentNullException(nameof(options), "Options cannot be null!"); throw new ArgumentNullException(nameof(options), "Options cannot be null!");
if ((Options?.Count ?? 0) + options.Length > SlashCommandBuilder.MaxOptionsCount) Options ??= new List<SlashCommandOptionBuilder>();
if (Options.Count + options.Length > SlashCommandBuilder.MaxOptionsCount)
throw new ArgumentOutOfRangeException(nameof(options), $"There can only be {SlashCommandBuilder.MaxOptionsCount} options per sub command group!"); throw new ArgumentOutOfRangeException(nameof(options), $"There can only be {SlashCommandBuilder.MaxOptionsCount} options per sub command group!");
foreach (var option in options) foreach (var option in options)

20
test/Discord.Net.Tests.Unit/CommandBuilderTests.cs
View File

@@ -17,7 +17,7 @@ public class CommandBuilderTests
ApplicationCommandOptionType.String, ApplicationCommandOptionType.String,
"option1 description", "option1 description",
isRequired: true, isRequired: true,
choices: new [] choices: new []
{ {
new ApplicationCommandOptionChoiceProperties() new ApplicationCommandOptionChoiceProperties()
{ {
@@ -34,4 +34,22 @@ public class CommandBuilderTests
.AddChoice("choice2", "2")); .AddChoice("choice2", "2"));
command.Build(); command.Build();
} }
[Fact]
public void BuildSubSlashCommand()
{
var command = new SlashCommandBuilder()
.WithName("command").WithDescription("Command desc.")
.AddOptions(new SlashCommandOptionBuilder()
.WithType(ApplicationCommandOptionType.SubCommand)
.WithName("subcommand").WithDescription("Subcommand desc.")
.AddOptions(
new SlashCommandOptionBuilder()
.WithType(ApplicationCommandOptionType.String)
.WithName("name1").WithDescription("desc1"),
new SlashCommandOptionBuilder()
.WithType(ApplicationCommandOptionType.String)
.WithName("name2").WithDescription("desc2")));
command.Build();
}
} }