diff --git a/src/Discord.Net.Core/Entities/Interactions/IApplicationCommandOption.cs b/src/Discord.Net.Core/Entities/Interactions/IApplicationCommandOption.cs index 0fc7fb4a3..5c2443c1b 100644 --- a/src/Discord.Net.Core/Entities/Interactions/IApplicationCommandOption.cs +++ b/src/Discord.Net.Core/Entities/Interactions/IApplicationCommandOption.cs @@ -29,12 +29,12 @@ namespace Discord /// /// The first required option for the user to complete--only one option can be default. /// - bool? Default { get; } + bool? IsDefault { get; } /// /// If the parameter is required or optional, default is . /// - bool? Required { get; } + bool? IsRequired { get; } /// /// Choices for string and int types for the user to pick from. diff --git a/src/Discord.Net.Rest/API/Common/ApplicationCommandOption.cs b/src/Discord.Net.Rest/API/Common/ApplicationCommandOption.cs index 93ee2e9b5..4bf172ebb 100644 --- a/src/Discord.Net.Rest/API/Common/ApplicationCommandOption.cs +++ b/src/Discord.Net.Rest/API/Common/ApplicationCommandOption.cs @@ -45,11 +45,11 @@ namespace Discord.API Options = cmd.Options.Select(x => new ApplicationCommandOption(x)).ToArray(); - Required = cmd.Required.HasValue - ? cmd.Required.Value + Required = cmd.IsRequired.HasValue + ? cmd.IsRequired.Value : Optional.Unspecified; - Default = cmd.Default.HasValue - ? cmd.Default.Value + Default = cmd.IsDefault.HasValue + ? cmd.IsDefault.Value : Optional.Unspecified; Name = cmd.Name; diff --git a/src/Discord.Net.Rest/Entities/Interactions/RestApplicationCommandOption.cs b/src/Discord.Net.Rest/Entities/Interactions/RestApplicationCommandOption.cs index 511712d97..643cdcf3c 100644 --- a/src/Discord.Net.Rest/Entities/Interactions/RestApplicationCommandOption.cs +++ b/src/Discord.Net.Rest/Entities/Interactions/RestApplicationCommandOption.cs @@ -24,10 +24,10 @@ namespace Discord.Rest public string Description { get; private set; } /// - public bool? Default { get; private set; } + public bool? IsDefault { get; private set; } /// - public bool? Required { get; private set; } + public bool? IsRequired { get; private set; } /// /// A collection of 's for this command. @@ -55,10 +55,10 @@ namespace Discord.Rest Description = model.Description; if (model.Default.IsSpecified) - Default = model.Default.Value; + IsDefault = model.Default.Value; if (model.Required.IsSpecified) - Required = model.Required.Value; + IsRequired = model.Required.Value; Options = model.Options.IsSpecified ? model.Options.Value.Select(x => Create(x)).ToImmutableArray() diff --git a/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommandOption.cs b/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommandOption.cs index 08b2757cd..ab1ead531 100644 --- a/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommandOption.cs +++ b/src/Discord.Net.WebSocket/Entities/Interaction/SocketBaseCommand/SocketApplicationCommandOption.cs @@ -23,10 +23,10 @@ namespace Discord.WebSocket public string Description { get; private set; } /// - public bool? Default { get; private set; } + public bool? IsDefault { get; private set; } /// - public bool? Required { get; private set; } + public bool? IsRequired { get; private set; } /// /// Choices for string and int types for the user to pick from. @@ -52,11 +52,11 @@ namespace Discord.WebSocket Type = model.Type; Description = model.Description; - Default = model.Default.IsSpecified + IsDefault = model.Default.IsSpecified ? model.Default.Value : null; - Required = model.Required.IsSpecified + IsRequired = model.Required.IsSpecified ? model.Required.Value : null;