Add RTCRegion (#403)

Discord-Net-Labs · Dec 24, 2021 · 48a9637 · 48a9637
1 parent 7039098
commit 48a9637
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 1 deletion.
diff --git a/src/Discord.Net.Core/Entities/Channels/IAudioChannel.cs b/src/Discord.Net.Core/Entities/Channels/IAudioChannel.cs
@@ -8,6 +8,14 @@ namespace Discord
     /// </summary>
     public interface IAudioChannel : IChannel
     {
+        /// <summary>
+        ///     Gets the RTC region for this audio channel.
+        /// </summary>
+        /// <remarks>
+        ///     This property can be <see langword="null"/>.
+        /// </remarks>
+        string RTCRegion { get; }
+
         /// <summary>
         ///     Connects to this audio channel.
         /// </summary>

diff --git a/src/Discord.Net.Rest/API/Common/Channel.cs b/src/Discord.Net.Rest/API/Common/Channel.cs
@@ -40,6 +40,8 @@ internal class Channel
         public Optional<int> Bitrate { get; set; }
         [JsonProperty("user_limit")]
         public Optional<int> UserLimit { get; set; }
+        [JsonProperty("rtc_region")]
+        public Optional<string> RTCRegion { get; set; }
 
         //PrivateChannel
         [JsonProperty("recipients")]

diff --git a/src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs
@@ -22,6 +22,8 @@ public class RestGroupChannel : RestChannel, IGroupChannel, IRestPrivateChannel,
 
         /// <inheritdoc />
         public string Name { get; private set; }
+        /// <inheritdoc/>
+        public string RTCRegion { get; private set; }
 
         public IReadOnlyCollection<RestGroupUser> Users => _users.ToReadOnlyCollection();
         public IReadOnlyCollection<RestGroupUser> Recipients
@@ -46,6 +48,8 @@ internal override void Update(Model model)
 
             if (model.Recipients.IsSpecified)
                 UpdateUsers(model.Recipients.Value);
+
+            RTCRegion = model.RTCRegion.GetValueOrDefault(null);
         }
         internal void UpdateUsers(API.User[] models)
         {

diff --git a/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs
@@ -21,7 +21,8 @@ public class RestVoiceChannel : RestGuildChannel, IVoiceChannel, IRestAudioChann
         public int? UserLimit { get; private set; }
         /// <inheritdoc />
         public ulong? CategoryId { get; private set; }
-
+        /// <inheritdoc/>
+        public string RTCRegion { get; private set; }
         /// <inheritdoc />
         public string Mention => MentionUtils.MentionChannel(Id);
 
@@ -46,6 +47,8 @@ internal override void Update(Model model)
 
             if(model.UserLimit.IsSpecified)
                 UserLimit = model.UserLimit.Value != 0 ? model.UserLimit.Value : (int?)null;
+
+            RTCRegion = model.RTCRegion.GetValueOrDefault(null);
         }
 
         /// <inheritdoc />

diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs
@@ -30,6 +30,9 @@ public class SocketGroupChannel : SocketChannel, IGroupChannel, ISocketPrivateCh
         /// <inheritdoc />
         public string Name { get; private set; }
 
+        /// <inheritdoc/>
+        public string RTCRegion { get; private set; }
+
         /// <inheritdoc />
         public IReadOnlyCollection<SocketMessage> CachedMessages => _messages?.Messages ?? ImmutableArray.Create<SocketMessage>();
 
@@ -67,6 +70,8 @@ internal override void Update(ClientState state, Model model)
 
             if (model.Recipients.IsSpecified)
                 UpdateUsers(state, model.Recipients.Value);
+
+            RTCRegion = model.RTCRegion.GetValueOrDefault(null);
         }
         private void UpdateUsers(ClientState state, UserModel[] models)
         {

diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs
@@ -21,6 +21,8 @@ public class SocketVoiceChannel : SocketGuildChannel, IVoiceChannel, ISocketAudi
         public int Bitrate { get; private set; }
         /// <inheritdoc />
         public int? UserLimit { get; private set; }
+        /// <inheritdoc/>
+        public string RTCRegion { get; private set; }
 
         /// <inheritdoc />
         public ulong? CategoryId { get; private set; }
@@ -66,6 +68,7 @@ internal override void Update(ClientState state, Model model)
             CategoryId = model.CategoryId;
             Bitrate = model.Bitrate.Value;
             UserLimit = model.UserLimit.Value != 0 ? model.UserLimit.Value : (int?)null;
+            RTCRegion = model.RTCRegion.GetValueOrDefault(null);
         }
 
         /// <inheritdoc />

diff --git a/test/Discord.Net.Tests.Unit/MockedEntities/MockedGroupChannel.cs b/test/Discord.Net.Tests.Unit/MockedEntities/MockedGroupChannel.cs
@@ -16,6 +16,8 @@ internal sealed class MockedGroupChannel : IGroupChannel
 
         public ulong Id => throw new NotImplementedException();
 
+        public string RTCRegion => throw new NotImplementedException();
+
         public Task<IAudioClient> ConnectAsync(bool selfDeaf = false, bool selfMute = false, bool external = false)
         {
             throw new NotImplementedException();

diff --git a/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs b/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs
@@ -29,6 +29,8 @@ internal sealed class MockedVoiceChannel : IVoiceChannel
         public DateTimeOffset CreatedAt => throw new NotImplementedException();
         public ulong Id => throw new NotImplementedException();
 
+        public string RTCRegion => throw new NotImplementedException();
+
         public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null)
         {
             throw new NotImplementedException();