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

[Fix] ButtonBuilder validations(#2943)

Browse Source
This commit is contained in:
Mihail Gribkov
2024-06-18 00:53:44 +03:00
committed by GitHub
parent 9d92435493
commit 5a71ad3b78
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,9 +267,6 @@ public class ButtonBuilder
/// <exception cref="InvalidOperationException">A non-link button must contain a custom id</exception> /// <exception cref="InvalidOperationException">A non-link button must contain a custom id</exception>
public ButtonComponent Build() public ButtonComponent Build()
{ {
if (string.IsNullOrWhiteSpace(Label) && Emote is null)
throw new InvalidOperationException("A button must have an Emote or a label!");
var a = 0; var a = 0;
if (!string.IsNullOrWhiteSpace(Url)) if (!string.IsNullOrWhiteSpace(Url))
a++; a++;
@@ -293,6 +290,8 @@ public class ButtonBuilder
case ButtonStyle.Success: case ButtonStyle.Success:
case ButtonStyle.Danger: case ButtonStyle.Danger:
{ {
if (string.IsNullOrWhiteSpace(Label) && Emote is null)
throw new InvalidOperationException("A button must have an Emote or a label!");
if (string.IsNullOrWhiteSpace(CustomId)) if (string.IsNullOrWhiteSpace(CustomId))
throw new InvalidOperationException("Non-link and non-premium buttons must have a custom id associated with them"); throw new InvalidOperationException("Non-link and non-premium buttons must have a custom id associated with them");
@@ -301,6 +300,8 @@ public class ButtonBuilder
case ButtonStyle.Link: case ButtonStyle.Link:
{ {
if (string.IsNullOrWhiteSpace(Label) && Emote is null)
throw new InvalidOperationException("A button must have an Emote or a label!");
if (string.IsNullOrWhiteSpace(Url)) if (string.IsNullOrWhiteSpace(Url))
throw new InvalidOperationException("Link buttons must have a link associated with them"); throw new InvalidOperationException("Link buttons must have a link associated with them");
UrlValidation.ValidateButton(Url); UrlValidation.ValidateButton(Url);