Merge eb1b04df92 into 5d7f2fc7ec

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

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Discord
@@ -8,6 +9,7 @@ namespace Discord
         /// <summary> Gets the name of this channel. </summary>
         string Name { get; }
 
+        [Obsolete("Deprecated, please use ITextChannel#IsNsfw instead")]
         /// <summary> Checks if the channel is NSFW. </summary>
         bool IsNsfw { get; }
 

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

@@ -8,6 +8,9 @@ namespace Discord
         /// <summary> Gets the current topic for this text channel. </summary>
         string Topic { get; }
 
+        /// <summary> Checks if the channel is NSFW. </summary>
+        new bool IsNsfw { get; }
+
         /// <summary> Modifies this text channel. </summary>
         Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null);
     }

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

@@ -78,6 +78,8 @@ namespace Discord.Rest
 
         private string DebuggerDisplay => $"{Name} ({Id}, Text)";
 
+        bool ITextChannel.IsNsfw => ChannelHelper.IsNsfw(this);
+
         //IMessageChannel
         async Task<IMessage> IMessageChannel.GetMessageAsync(ulong id, CacheMode mode, RequestOptions options)
         {

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

@@ -112,6 +112,9 @@ namespace Discord.WebSocket
         }
         
         private string DebuggerDisplay => $"{Name} ({Id}, Text)";
+
+        bool ITextChannel.IsNsfw => ChannelHelper.IsNsfw(this);
+
         internal new SocketTextChannel Clone() => MemberwiseClone() as SocketTextChannel;
 
         //IGuildChannel