diff --git a/src/Discord.Net.Core/Entities/Stickers/ISticker.cs b/src/Discord.Net.Core/Entities/Stickers/ISticker.cs index 6d0eee1b4..a3c520b4a 100644 --- a/src/Discord.Net.Core/Entities/Stickers/ISticker.cs +++ b/src/Discord.Net.Core/Entities/Stickers/ISticker.cs @@ -59,7 +59,7 @@ namespace Discord /// /// Gets whether this guild sticker can be used, may be false due to loss of Server Boosts /// - bool? Available { get; } + bool? IsAvailable { get; } /// /// Gets the standard sticker's sort order within its pack diff --git a/src/Discord.Net.Rest/Entities/Messages/Sticker.cs b/src/Discord.Net.Rest/Entities/Messages/Sticker.cs index 6490978e7..75bc9bd38 100644 --- a/src/Discord.Net.Rest/Entities/Messages/Sticker.cs +++ b/src/Discord.Net.Rest/Entities/Messages/Sticker.cs @@ -20,7 +20,7 @@ namespace Discord.Rest /// public StickerType Type { get; protected set; } /// - public bool? Available { get; protected set; } + public bool? IsAvailable { get; protected set; } /// public int? SortOrder { get; protected set; } /// @@ -47,7 +47,7 @@ namespace Discord.Rest Tags = model.Tags.IsSpecified ? model.Tags.Value.Split(',').Select(x => x.Trim()).ToArray() : new string[0]; Type = model.Type; SortOrder = model.SortValue; - Available = model.Available; + IsAvailable = model.Available; Format = model.FormatType; } diff --git a/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs b/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs index a1c2f1002..758ecebb4 100644 --- a/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs +++ b/src/Discord.Net.WebSocket/Entities/Stickers/SocketSticker.cs @@ -35,7 +35,7 @@ namespace Discord.WebSocket public StickerFormatType Format { get; protected set; } /// - public virtual bool? Available { get; protected set; } + public virtual bool? IsAvailable { get; protected set; } /// public virtual int? SortOrder { get; private set; } @@ -65,7 +65,7 @@ namespace Discord.WebSocket Name = model.Name; Description = model.Desription; PackId = model.PackId; - Available = model.Available; + IsAvailable = model.Available; Format = model.FormatType; Type = model.Type; SortOrder = model.SortValue; @@ -94,7 +94,7 @@ namespace Discord.WebSocket stickerModel.PackId == PackId && stickerModel.Type == Type && stickerModel.SortValue == SortOrder && - stickerModel.Available == Available && + stickerModel.Available == IsAvailable && (!stickerModel.Tags.IsSpecified || stickerModel.Tags.Value == string.Join(", ", Tags)); } else diff --git a/src/Discord.Net.WebSocket/Entities/Stickers/SocketUnknownSticker.cs b/src/Discord.Net.WebSocket/Entities/Stickers/SocketUnknownSticker.cs index db1124a32..2e9514595 100644 --- a/src/Discord.Net.WebSocket/Entities/Stickers/SocketUnknownSticker.cs +++ b/src/Discord.Net.WebSocket/Entities/Stickers/SocketUnknownSticker.cs @@ -26,7 +26,7 @@ namespace Discord.WebSocket public override ulong PackId => 0; /// - public override bool? Available + public override bool? IsAvailable => null; ///