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

fix NRE introduced in 3.17.3 (#3101)

Browse Source
This commit is contained in:
Mihail Gribkov
2025-04-27 00:14:36 +03:00
committed by GitHub
parent d27bb49b2d
commit ec0621a264
6 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Discord.Net.Core/Entities/Interactions/ApplicationCommands/ApplicationCommandOptionChoice.cs
View File

@@ -21,8 +21,12 @@ namespace Discord
get => _name;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Name));
Preconditions.AtMost(value.Length, 100, nameof(Name));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Name));
Preconditions.AtMost(value.Length, 100, nameof(Name));
}
_name = value;
}
}
@@ -38,7 +42,7 @@ namespace Discord
get => _value;
set
{
if (value != null && value is not string && !value.IsNumericType())
if (value is not null && value is not string && !value.IsNumericType())
throw new ArgumentException($"The value of a choice must be a string or a numeric type! Value: \"{value}\"");
_value = value;
}

16
src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/ButtonBuilder.cs
View File

@@ -24,8 +24,12 @@ public class ButtonBuilder
get => _label;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Label));
Preconditions.AtMost(value.Length, MaxButtonLabelLength, nameof(Label));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Label));
Preconditions.AtMost(value.Length, MaxButtonLabelLength, nameof(Label));
}
_label = value;
}
}
@@ -40,8 +44,12 @@ public class ButtonBuilder
get => _customId;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
}
_customId = value;
}
}

16
src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuBuilder.cs
View File

@@ -35,8 +35,12 @@ public class SelectMenuBuilder
get => _customId;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
}
_customId = value;
}
}
@@ -63,8 +67,12 @@ public class SelectMenuBuilder
get => _placeholder;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Placeholder));
Preconditions.AtMost(value.Length, MaxPlaceholderLength, nameof(Placeholder));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Placeholder));
Preconditions.AtMost(value.Length, MaxPlaceholderLength, nameof(Placeholder));
}
_placeholder = value;
}
}

24
src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuOptionBuilder.cs
View File

@@ -32,8 +32,12 @@ public class SelectMenuOptionBuilder
get => _label;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Label));
Preconditions.AtMost(value.Length, MaxSelectLabelLength, nameof(Label));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Label));
Preconditions.AtMost(value.Length, MaxSelectLabelLength, nameof(Label));
}
_label = value;
}
}
@@ -48,8 +52,12 @@ public class SelectMenuOptionBuilder
get => _value;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Value));
Preconditions.AtMost(value.Length, MaxSelectValueLength, nameof(Value));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Value));
Preconditions.AtMost(value.Length, MaxSelectValueLength, nameof(Value));
}
_value = value;
}
}
@@ -64,8 +72,12 @@ public class SelectMenuOptionBuilder
get => _description;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(Description));
Preconditions.AtMost(value.Length, MaxDescriptionLength, nameof(Description));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(Description));
Preconditions.AtMost(value.Length, MaxDescriptionLength, nameof(Description));
}
_description = value;
}
}

8
src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/TextInputBuilder.cs
View File

@@ -24,8 +24,12 @@ public class TextInputBuilder
get => _customId;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
}
_customId = value;
}
}

8
src/Discord.Net.Core/Entities/Interactions/Modals/ModalBuilder.cs
View File

@@ -40,8 +40,12 @@ namespace Discord
get => _customId;
set
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
if (value is not null)
{
Preconditions.AtLeast(value.Length, 1, nameof(CustomId));
Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));
}
_customId = value;
}
}