diff --git a/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs b/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs
index b7ef75f92..1fde8c7d7 100644
--- a/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs
+++ b/src/Discord.Net.Core/Entities/Interactions/Message Components/ComponentBuilder.cs
@@ -76,7 +76,7 @@ namespace Discord
AddComponent(cmp, row);
break;
case SelectMenuComponent menu:
- WithSelectMenu(menu.Placeholder, menu.CustomId, menu.Options.Select(x => new SelectMenuOptionBuilder(x.Label, x.Value, x.Description, x.Emote, x.IsDefault)).ToList(), menu.Placeholder, menu.MinValues, menu.MaxValues, menu.IsDisabled, row);
+ WithSelectMenu(menu.CustomId, menu.Options.Select(x => new SelectMenuOptionBuilder(x.Label, x.Value, x.Description, x.Emote, x.IsDefault)).ToList(), menu.Placeholder, menu.MinValues, menu.MaxValues, menu.IsDisabled, row);
break;
}
}
@@ -85,7 +85,6 @@ namespace Discord
/// Adds a to the at the specific row.
/// If the row cannot accept the component then it will add it to a row that can.
///
- /// The label of the menu.
/// The custom id of the menu.
/// The options of the menu.
/// The placeholder of the menu.
@@ -94,7 +93,7 @@ namespace Discord
/// Whether or not the menu is disabled.
/// The row to add the menu to.
///
- public ComponentBuilder WithSelectMenu(string label, string customId, List options,
+ public ComponentBuilder WithSelectMenu(string customId, List options,
string placeholder = null, int minValues = 1, int maxValues = 1, bool disabled = false, int row = 0)
{
return WithSelectMenu(new SelectMenuBuilder()
@@ -413,7 +412,7 @@ namespace Discord
///
/// Gets or sets whether the current button is disabled.
///
- public bool Disabled { get; set; }
+ public bool IsDisabled { get; set; }
private string _label;
@@ -432,14 +431,14 @@ namespace Discord
/// The custom ID of this button.
/// The custom ID of this button.
/// The emote of this button.
- /// Disabled this button or not.
- public ButtonBuilder(string label = null, string customId = null, ButtonStyle style = ButtonStyle.Primary, string url = null, IEmote emote = null, bool disabled = false)
+ /// Disabled this button or not.
+ public ButtonBuilder(string label = null, string customId = null, ButtonStyle style = ButtonStyle.Primary, string url = null, IEmote emote = null, bool isDisabled = false)
{
CustomId = customId;
Style = style;
Url = url;
Label = label;
- Disabled = disabled;
+ IsDisabled = isDisabled;
Emote = emote;
}
@@ -452,7 +451,7 @@ namespace Discord
Style = button.Style;
Url = button.Url;
Label = button.Label;
- Disabled = button.Disabled;
+ IsDisabled = button.Disabled;
Emote = button.Emote;
}
@@ -566,11 +565,11 @@ namespace Discord
///
/// Sets whether the current button is disabled.
///
- /// Whether the current button is disabled or not.
+ /// Whether the current button is disabled or not.
/// The current builder.
- public ButtonBuilder WithDisabled(bool disabled)
+ public ButtonBuilder WithDisabled(bool isDisabled)
{
- Disabled = disabled;
+ IsDisabled = isDisabled;
return this;
}
@@ -601,7 +600,7 @@ namespace Discord
else if (string.IsNullOrEmpty(CustomId))
throw new InvalidOperationException("Non-link buttons must have a custom id associated with them");
- return new ButtonComponent(Style, Label, Emote, CustomId, Url, Disabled);
+ return new ButtonComponent(Style, Label, Emote, CustomId, Url, IsDisabled);
}
}
@@ -718,7 +717,7 @@ namespace Discord
///
/// Gets or sets whether the current menu is disabled.
///
- public bool Disabled { get; set; }
+ public bool IsDisabled { get; set; }
private List _options = new List();
private int _minValues = 1;
@@ -740,7 +739,7 @@ namespace Discord
CustomId = selectMenu.Placeholder;
MaxValues = selectMenu.MaxValues;
MinValues = selectMenu.MinValues;
- Disabled = selectMenu.IsDisabled;
+ IsDisabled = selectMenu.IsDisabled;
Options = selectMenu.Options?
.Select(x => new SelectMenuOptionBuilder(x.Label, x.Value, x.Description, x.Emote, x.IsDefault))
.ToList();
@@ -754,13 +753,13 @@ namespace Discord
/// The placeholder of this select menu.
/// The max values of this select menu.
/// The min values of this select menu.
- /// Disabled this select menu or not.
- public SelectMenuBuilder(string customId, List options, string placeholder = null, int maxValues = 1, int minValues = 1, bool disabled = false)
+ /// Disabled this select menu or not.
+ public SelectMenuBuilder(string customId, List options, string placeholder = null, int maxValues = 1, int minValues = 1, bool isDisabled = false)
{
CustomId = customId;
Options = options;
Placeholder = placeholder;
- Disabled = disabled;
+ IsDisabled = isDisabled;
MaxValues = maxValues;
MinValues = minValues;
}
@@ -873,13 +872,13 @@ namespace Discord
///
/// Sets whether the current menu is disabled.
///
- /// Whether the current menu is disabled or not.
+ /// Whether the current menu is disabled or not.
///
/// The current builder.
///
- public SelectMenuBuilder WithDisabled(bool disabled)
+ public SelectMenuBuilder WithDisabled(bool isDisabled)
{
- Disabled = disabled;
+ IsDisabled = isDisabled;
return this;
}
@@ -891,7 +890,7 @@ namespace Discord
{
var options = Options?.Select(x => x.Build()).ToList();
- return new SelectMenuComponent(CustomId, options, Placeholder, MinValues, MaxValues, Disabled);
+ return new SelectMenuComponent(CustomId, options, Placeholder, MinValues, MaxValues, IsDisabled);
}
}
@@ -991,7 +990,7 @@ namespace Discord
///
/// Gets or sets the whether or not this option will render selected by default.
///
- public bool? Default { get; set; }
+ public bool? IsDefault { get; set; }
private string _label;
private string _value;
@@ -1009,14 +1008,14 @@ namespace Discord
/// The value of this option.
/// The description of this option.
/// The emote of this option.
- /// Render this option as selected by default or not.
- public SelectMenuOptionBuilder(string label, string value, string description = null, IEmote emote = null, bool? @default = null)
+ /// Render this option as selected by default or not.
+ public SelectMenuOptionBuilder(string label, string value, string description = null, IEmote emote = null, bool? isDefault = null)
{
Label = label;
Value = value;
Description = description;
Emote = emote;
- Default = @default;
+ IsDefault = isDefault;
}
///
@@ -1028,7 +1027,7 @@ namespace Discord
Value = option.Value;
Description = option.Description;
Emote = option.Emote;
- Default = option.IsDefault;
+ IsDefault = option.IsDefault;
}
///
@@ -1089,13 +1088,13 @@ namespace Discord
///
/// Sets the field default.
///
- /// The value to set the field default to.
+ /// The value to set the field default to.
///
/// The current builder.
///
- public SelectMenuOptionBuilder WithDefault(bool defaultValue)
+ public SelectMenuOptionBuilder WithDefault(bool isDefault)
{
- Default = defaultValue;
+ IsDefault = isDefault;
return this;
}
@@ -1105,7 +1104,7 @@ namespace Discord
/// The newly built .
public SelectMenuOption Build()
{
- return new SelectMenuOption(Label, Value, Description, Emote, Default);
+ return new SelectMenuOption(Label, Value, Description, Emote, IsDefault);
}
}
}