From c6c18bcf47c4f8b8ad009b8c4b41e7bf3613b84d Mon Sep 17 00:00:00 2001 From: RogueException Date: Thu, 19 May 2016 10:04:59 -0300 Subject: [PATCH] Added Voice Channel user_limit --- src/Discord.Net/API/Common/Channel.cs | 6 ++++++ src/Discord.Net/API/DiscordAPIClient.cs | 1 + src/Discord.Net/API/Rest/ModifyVoiceChannelParams.cs | 2 ++ src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/Discord.Net/API/Common/Channel.cs b/src/Discord.Net/API/Common/Channel.cs index e724f1285..f50c31a09 100644 --- a/src/Discord.Net/API/Common/Channel.cs +++ b/src/Discord.Net/API/Common/Channel.cs @@ -23,10 +23,16 @@ namespace Discord.API public int Position { get; set; } [JsonProperty("permission_overwrites")] public Overwrite[] PermissionOverwrites { get; set; } + + //TextChannel [JsonProperty("topic")] public string Topic { get; set; } + + //VoiceChannel [JsonProperty("bitrate")] public int Bitrate { get; set; } + [JsonProperty("user_limit")] + public int UserLimit { get; set; } //DMChannel [JsonProperty("recipient")] diff --git a/src/Discord.Net/API/DiscordAPIClient.cs b/src/Discord.Net/API/DiscordAPIClient.cs index bde034256..c634ea3f7 100644 --- a/src/Discord.Net/API/DiscordAPIClient.cs +++ b/src/Discord.Net/API/DiscordAPIClient.cs @@ -235,6 +235,7 @@ namespace Discord.API Preconditions.NotEqual(channelId, 0, nameof(channelId)); Preconditions.NotNull(args, nameof(args)); Preconditions.GreaterThan(args.Bitrate, 0, nameof(args.Bitrate)); + Preconditions.AtLeast(args.UserLimit, 0, nameof(args.Bitrate)); Preconditions.AtLeast(args.Position, 0, nameof(args.Position)); Preconditions.NotNullOrEmpty(args.Name, nameof(args.Name)); diff --git a/src/Discord.Net/API/Rest/ModifyVoiceChannelParams.cs b/src/Discord.Net/API/Rest/ModifyVoiceChannelParams.cs index b268783c8..8d449c607 100644 --- a/src/Discord.Net/API/Rest/ModifyVoiceChannelParams.cs +++ b/src/Discord.Net/API/Rest/ModifyVoiceChannelParams.cs @@ -6,5 +6,7 @@ namespace Discord.API.Rest { [JsonProperty("bitrate")] public Optional Bitrate { get; set; } + [JsonProperty("user_limit")] + public Optional UserLimit { get; set; } } } diff --git a/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs b/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs index 208e31e49..e105aabd6 100644 --- a/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs +++ b/src/Discord.Net/Rest/Entities/Channels/VoiceChannel.cs @@ -12,6 +12,8 @@ namespace Discord.Rest { /// public int Bitrate { get; private set; } + /// + public int UserLimit { get; private set; } internal VoiceChannel(Guild guild, Model model) : base(guild, model) @@ -21,6 +23,7 @@ namespace Discord.Rest { base.Update(model); Bitrate = model.Bitrate; + UserLimit = model.UserLimit; } ///