From ae645d626997e4a0e90ce10dc4e4dec915b9994e Mon Sep 17 00:00:00 2001 From: v3Monsta Date: Wed, 16 Aug 2017 10:05:17 -0400 Subject: [PATCH 1/2] Expose IsNsfw prop directly in ITextChannel --- src/Discord.Net.Core/Entities/Channels/IChannel.cs | 4 +++- src/Discord.Net.Core/Entities/Channels/ITextChannel.cs | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net.Core/Entities/Channels/IChannel.cs b/src/Discord.Net.Core/Entities/Channels/IChannel.cs index fbb979951..9471857eb 100644 --- a/src/Discord.Net.Core/Entities/Channels/IChannel.cs +++ b/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 /// Gets the name of this channel. string Name { get; } + [Obsolete("Deprecated, please use ITextChannel#IsNsfw instead")] /// Checks if the channel is NSFW. bool IsNsfw { get; } diff --git a/src/Discord.Net.Core/Entities/Channels/ITextChannel.cs b/src/Discord.Net.Core/Entities/Channels/ITextChannel.cs index 038faf6bc..0e67ebe80 100644 --- a/src/Discord.Net.Core/Entities/Channels/ITextChannel.cs +++ b/src/Discord.Net.Core/Entities/Channels/ITextChannel.cs @@ -8,6 +8,9 @@ namespace Discord /// Gets the current topic for this text channel. string Topic { get; } + /// Checks if the channel is NSFW. + new bool IsNsfw { get; } + /// Modifies this text channel. Task ModifyAsync(Action func, RequestOptions options = null); } From eb1b04df92db1e47d4346abc1f7d7c68825a99a9 Mon Sep 17 00:00:00 2001 From: v3Monsta Date: Wed, 16 Aug 2017 21:44:56 -0400 Subject: [PATCH 2/2] Added missing implementations --- src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs | 2 ++ .../Entities/Channels/SocketTextChannel.cs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs index d7405fb4a..f8daef473 100644 --- a/src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs +++ b/src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs @@ -75,6 +75,8 @@ namespace Discord.Rest private string DebuggerDisplay => $"{Name} ({Id}, Text)"; + bool ITextChannel.IsNsfw => ChannelHelper.IsNsfw(this); + //IMessageChannel async Task IMessageChannel.GetMessageAsync(ulong id, CacheMode mode, RequestOptions options) { diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs index c22523e00..c6c9acb87 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs @@ -110,6 +110,9 @@ namespace Discord.WebSocket } private string DebuggerDisplay => $"{Name} ({Id}, Text)"; + + bool ITextChannel.IsNsfw => ChannelHelper.IsNsfw(this); + internal new SocketTextChannel Clone() => MemberwiseClone() as SocketTextChannel; //IGuildChannel