Refactored IChannel.Nsfw to IsNsfw, removed NsfwUtils

Per pull-request feedback

src/Discord.Net.Commands/Attributes/Preconditions/RequireNsfwAttribute.cs

@@ -11,7 +11,7 @@ namespace Discord.Commands
     {
         public override Task<PreconditionResult> CheckPermissions(ICommandContext context, CommandInfo command, IDependencyMap map)
         {
-            if (context.Channel.Nsfw)
+            if (context.Channel.IsNsfw)
                 return Task.FromResult(PreconditionResult.FromSuccess());
             else
                 return Task.FromResult(PreconditionResult.FromError("This command may only be invoked in an NSFW channel."));

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

@@ -9,7 +9,7 @@ namespace Discord
         string Name { get; }
 
         /// <summary> Checks if the channel is NSFW. </summary>
-        bool Nsfw { get; }
+        bool IsNsfw { get; }
 
         /// <summary> Gets a collection of all users in this channel. </summary>
         IAsyncEnumerable<IReadOnlyCollection<IUser>> GetUsersAsync(CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null);

src/Discord.Net.Core/Utils/NsfwUtils.cs

@@ -1,10 +0,0 @@
-namespace Discord
-{
-    public static class NsfwUtils
-    {
-        public static bool IsNsfw(IChannel channel) =>
-            IsNsfw(channel.Name);
-        public static bool IsNsfw(string channelName) =>
-            channelName.StartsWith("nsfw");
-    }
-}

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

@@ -289,5 +289,10 @@ namespace Discord.Rest
                 author = RestUser.Create(client, guild, model, webhookId);
             return author;
         }
+
+        public static bool IsNsfw(IChannel channel) =>
+            IsNsfw(channel.Name);
+        public static bool IsNsfw(string channelName) =>
+            channelName.StartsWith("nsfw");
     }
 }

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

@@ -46,7 +46,7 @@ namespace Discord.Rest
 
         //IChannel
         string IChannel.Name => null;
-        bool IChannel.Nsfw => NsfwUtils.IsNsfw(this);
+        bool IChannel.IsNsfw => ChannelHelper.IsNsfw(this);
 
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)
             => Task.FromResult<IUser>(null); //Overriden

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

@@ -97,7 +97,7 @@ namespace Discord.Rest
 
         //IChannel
         string IChannel.Name { get { throw new NotSupportedException(); } }
-        bool IChannel.Nsfw { get { throw new NotSupportedException(); } }
+        bool IChannel.IsNsfw { get { throw new NotSupportedException(); } }
         IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options)
         {
             throw new NotSupportedException();

src/Discord.Net.Rpc/Entities/Channels/RpcChannel.cs

@@ -1,4 +1,5 @@
-using System;
+using Discord.Rest;
+using System;
 
 using Model = Discord.API.Rpc.Channel;
 
@@ -7,7 +8,7 @@ namespace Discord.Rpc
     public class RpcChannel : RpcEntity<ulong>
     {
         public string Name { get; private set; }
-        public bool Nsfw => NsfwUtils.IsNsfw(Name);
+        public bool IsNsfw => ChannelHelper.IsNsfw(Name);
 
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
 

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

@@ -1,4 +1,5 @@
-using System;
+using Discord.Rest;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -40,7 +41,7 @@ namespace Discord.WebSocket
 
         //IChannel
         string IChannel.Name => null;
-        bool IChannel.Nsfw => NsfwUtils.IsNsfw(this);
+        bool IChannel.IsNsfw => ChannelHelper.IsNsfw(this);
 
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)
             => Task.FromResult<IUser>(null); //Overridden