fix NRE introduced in 3.17.3 (#3101)

Misha-133 · web-flow · commit ec0621a26455 · 2025-04-27T00:14:36.000+03:00
diff --git a/src/Discord.Net.Core/Entities/Interactions/ApplicationCommands/ApplicationCommandOptionChoice.cs b/src/Discord.Net.Core/Entities/Interactions/ApplicationCommands/ApplicationCommandOptionChoice.cs
@@ -21,8 +21,12 @@ public string Name
             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 @@ public object Value
             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;
             }
diff --git a/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/ButtonBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/ButtonBuilder.cs
@@ -24,8 +24,12 @@ public string Label
         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 string CustomId
         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;
         }
     }
diff --git a/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuBuilder.cs
@@ -35,8 +35,12 @@ public string CustomId
         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 string Placeholder
         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;
         }
     }
diff --git a/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuOptionBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/SelectMenuOptionBuilder.cs
@@ -32,8 +32,12 @@ public string Label
         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 string Value
         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 string Description
         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;
         }
     }
diff --git a/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/TextInputBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/MessageComponents/Builders/TextInputBuilder.cs
@@ -24,8 +24,12 @@ public string CustomId
         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;
         }
     }
diff --git a/src/Discord.Net.Core/Entities/Interactions/Modals/ModalBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/Modals/ModalBuilder.cs
@@ -40,8 +40,12 @@ public string CustomId
             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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,12 @@ public string Name`
`21`	`21`	`get => _name;`
`22`	`22`	`set`
`23`	`23`	`{`
`24`		`- Preconditions.AtLeast(value.Length, 1, nameof(Name));`
`25`		`- Preconditions.AtMost(value.Length, 100, nameof(Name));`
	`24`	`+ if (value is not null)`
	`25`	`+ {`
	`26`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Name));`
	`27`	`+ Preconditions.AtMost(value.Length, 100, nameof(Name));`
	`28`	`+ }`
	`29`	`+`
`26`	`30`	`_name = value;`
`27`	`31`	`}`
`28`	`32`	`}`
`@@ -38,7 +42,7 @@ public object Value`
`38`	`42`	`get => _value;`
`39`	`43`	`set`
`40`	`44`	`{`
`41`		`- if (value != null && value is not string && !value.IsNumericType())`
	`45`	`+ if (value is not null && value is not string && !value.IsNumericType())`
`42`	`46`	`throw new ArgumentException($"The value of a choice must be a string or a numeric type! Value: \"{value}\"");`
`43`	`47`	`_value = value;`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,12 @@ public string Label`
`24`	`24`	`get => _label;`
`25`	`25`	`set`
`26`	`26`	`{`
`27`		`- Preconditions.AtLeast(value.Length, 1, nameof(Label));`
`28`		`- Preconditions.AtMost(value.Length, MaxButtonLabelLength, nameof(Label));`
	`27`	`+ if (value is not null)`
	`28`	`+ {`
	`29`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Label));`
	`30`	`+ Preconditions.AtMost(value.Length, MaxButtonLabelLength, nameof(Label));`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`_label = value;`
`30`	`34`	`}`
`31`	`35`	`}`
`@@ -40,8 +44,12 @@ public string CustomId`
`40`	`44`	`get => _customId;`
`41`	`45`	`set`
`42`	`46`	`{`
`43`		`- Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
`44`		`- Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`47`	`+ if (value is not null)`
	`48`	`+ {`
	`49`	`+ Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
	`50`	`+ Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`51`	`+ }`
	`52`	`+`
`45`	`53`	`_customId = value;`
`46`	`54`	`}`
`47`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,12 @@ public string CustomId`
`35`	`35`	`get => _customId;`
`36`	`36`	`set`
`37`	`37`	`{`
`38`		`- Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
`39`		`- Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`38`	`+ if (value is not null)`
	`39`	`+ {`
	`40`	`+ Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
	`41`	`+ Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`42`	`+ }`
	`43`	`+`
`40`	`44`	`_customId = value;`
`41`	`45`	`}`
`42`	`46`	`}`
`@@ -63,8 +67,12 @@ public string Placeholder`
`63`	`67`	`get => _placeholder;`
`64`	`68`	`set`
`65`	`69`	`{`
`66`		`- Preconditions.AtLeast(value.Length, 1, nameof(Placeholder));`
`67`		`- Preconditions.AtMost(value.Length, MaxPlaceholderLength, nameof(Placeholder));`
	`70`	`+ if (value is not null)`
	`71`	`+ {`
	`72`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Placeholder));`
	`73`	`+ Preconditions.AtMost(value.Length, MaxPlaceholderLength, nameof(Placeholder));`
	`74`	`+ }`
	`75`	`+`
`68`	`76`	`_placeholder = value;`
`69`	`77`	`}`
`70`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,12 @@ public string Label`
`32`	`32`	`get => _label;`
`33`	`33`	`set`
`34`	`34`	`{`
`35`		`- Preconditions.AtLeast(value.Length, 1, nameof(Label));`
`36`		`- Preconditions.AtMost(value.Length, MaxSelectLabelLength, nameof(Label));`
	`35`	`+ if (value is not null)`
	`36`	`+ {`
	`37`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Label));`
	`38`	`+ Preconditions.AtMost(value.Length, MaxSelectLabelLength, nameof(Label));`
	`39`	`+ }`
	`40`	`+`
`37`	`41`	`_label = value;`
`38`	`42`	`}`
`39`	`43`	`}`
`@@ -48,8 +52,12 @@ public string Value`
`48`	`52`	`get => _value;`
`49`	`53`	`set`
`50`	`54`	`{`
`51`		`- Preconditions.AtLeast(value.Length, 1, nameof(Value));`
`52`		`- Preconditions.AtMost(value.Length, MaxSelectValueLength, nameof(Value));`
	`55`	`+ if (value is not null)`
	`56`	`+ {`
	`57`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Value));`
	`58`	`+ Preconditions.AtMost(value.Length, MaxSelectValueLength, nameof(Value));`
	`59`	`+ }`
	`60`	`+`
`53`	`61`	`_value = value;`
`54`	`62`	`}`
`55`	`63`	`}`
`@@ -64,8 +72,12 @@ public string Description`
`64`	`72`	`get => _description;`
`65`	`73`	`set`
`66`	`74`	`{`
`67`		`- Preconditions.AtLeast(value.Length, 1, nameof(Description));`
`68`		`- Preconditions.AtMost(value.Length, MaxDescriptionLength, nameof(Description));`
	`75`	`+ if (value is not null)`
	`76`	`+ {`
	`77`	`+ Preconditions.AtLeast(value.Length, 1, nameof(Description));`
	`78`	`+ Preconditions.AtMost(value.Length, MaxDescriptionLength, nameof(Description));`
	`79`	`+ }`
	`80`	`+`
`69`	`81`	`_description = value;`
`70`	`82`	`}`
`71`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,12 @@ public string CustomId`
`24`	`24`	`get => _customId;`
`25`	`25`	`set`
`26`	`26`	`{`
`27`		`- Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
`28`		`- Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`27`	`+ if (value is not null)`
	`28`	`+ {`
	`29`	`+ Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
	`30`	`+ Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`31`	`+ }`
	`32`	`+`
`29`	`33`	`_customId = value;`
`30`	`34`	`}`
`31`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,12 @@ public string CustomId`
`40`	`40`	`get => _customId;`
`41`	`41`	`set`
`42`	`42`	`{`
`43`		`- Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
`44`		`- Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`43`	`+ if (value is not null)`
	`44`	`+ {`
	`45`	`+ Preconditions.AtLeast(value.Length, 1, nameof(CustomId));`
	`46`	`+ Preconditions.AtMost(value.Length, ComponentBuilder.MaxCustomIdLength, nameof(CustomId));`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`_customId = value;`
`46`	`50`	`}`
`47`	`51`	`}`