yippee (#3021)

Author: Misha-133

src/Discord.Net.Core/Entities/Channels/IChannel.cs

@@ -8,6 +8,11 @@ namespace Discord
     /// </summary>
     public interface IChannel : ISnowflakeEntity
     {
+        /// <summary>
+        ///     Get the type of this channel.
+        /// </summary>
+        ChannelType ChannelType { get; }
+
         /// <summary>
         ///     Gets the name of this channel.
         /// </summary>

src/Discord.Net.Rest/Entities/Channels/RestChannel.cs

@@ -12,6 +12,10 @@ namespace Discord.Rest
     public class RestChannel : RestEntity<ulong>, IChannel, IUpdateable
     {
         #region RestChannel
+
+        /// <inheritdoc />
+        public ChannelType ChannelType { get; internal set; }
+
         /// <inheritdoc />
         public virtual DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
 
@@ -68,7 +72,11 @@ internal static IRestPrivateChannel CreatePrivate(BaseDiscordClient discord, Mod
                 _ => throw new InvalidOperationException($"Unexpected channel type: {model.Type}"),
             };
         }
-        internal virtual void Update(Model model) { }
+
+        internal virtual void Update(Model model)
+        {
+            ChannelType = model.Type;
+        }
 
         /// <inheritdoc />
         public virtual Task UpdateAsync(RequestOptions options = null) => Task.Delay(0);

src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs

@@ -47,6 +47,8 @@ internal RestDMChannel(BaseDiscordClient discord, ulong id, ulong? recipientId)
         }
         internal override void Update(Model model)
         {
+            base.Update(model);
+
             if(model.Recipients.IsSpecified)
                 Recipient?.Update(model.Recipients.Value[0]);
         }

src/Discord.Net.Rest/Entities/Channels/RestGroupChannel.cs

@@ -41,6 +41,7 @@ internal RestGroupChannel(BaseDiscordClient discord, ulong id)
         }
         internal override void Update(Model model)
         {
+            base.Update(model);
             if (model.Name.IsSpecified)
                 Name = model.Name.Value;
             if (model.Icon.IsSpecified)

src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs

@@ -53,6 +53,7 @@ internal static RestGuildChannel Create(BaseDiscordClient discord, IGuild guild,
         }
         internal override void Update(Model model)
         {
+            base.Update(model);
             Name = model.Name.Value;
 
             if (model.Position.IsSpecified)

src/Discord.Net.WebSocket/Entities/Channels/SocketChannel.cs

@@ -14,6 +14,9 @@ namespace Discord.WebSocket
     public abstract class SocketChannel : SocketEntity<ulong>, IChannel
     {
         #region SocketChannel
+        /// <inheritdoc />
+        public ChannelType ChannelType { get; internal set; }
+
         /// <summary>
         ///     Gets when the channel is created.
         /// </summary>
@@ -38,7 +41,11 @@ internal static ISocketPrivateChannel CreatePrivate(DiscordSocketClient discord,
                 _ => throw new InvalidOperationException($"Unexpected channel type: {model.Type}"),
             };
         }
-        internal abstract void Update(ClientState state, Model model);
+
+        internal virtual void Update(ClientState state, Model model)
+        {
+            ChannelType = model.Type;
+        }
         #endregion
 
         #region User

src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs

@@ -44,6 +44,7 @@ internal static SocketDMChannel Create(DiscordSocketClient discord, ClientState
         internal override void Update(ClientState state, Model model)
         {
             Recipient.Update(state, model.Recipients.Value[0]);
+            base.Update(state, model);
         }
         internal static SocketDMChannel Create(DiscordSocketClient discord, ClientState state, ulong channelId, API.User recipient)
         {

src/Discord.Net.WebSocket/Entities/Channels/SocketGroupChannel.cs

@@ -63,6 +63,7 @@ internal static SocketGroupChannel Create(DiscordSocketClient discord, ClientSta
         }
         internal override void Update(ClientState state, Model model)
         {
+            base.Update(state, model);
             if (model.Name.IsSpecified)
                 Name = model.Name.Value;
             if (model.Icon.IsSpecified)

src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs

@@ -70,6 +70,7 @@ internal static SocketGuildChannel Create(SocketGuild guild, ClientState state,
         /// <inheritdoc />
         internal override void Update(ClientState state, Model model)
         {
+            base.Update(state, model);
             Name = model.Name.Value;
             Position = model.Position.GetValueOrDefault(0);
 

test/Discord.Net.Tests.Unit/MockedEntities/MockedCategoryChannel.cs

@@ -7,6 +7,7 @@ namespace Discord
 {
     internal sealed class MockedCategoryChannel : ICategoryChannel
     {
+        public ChannelType ChannelType => ChannelType.Category;
         public int Position => throw new NotImplementedException();
 
         public IGuild Guild => throw new NotImplementedException();