Browse Source

Mark ChannelHelper.IsNsfw Obsolete

Discord no longer treats channels prefixed with 'nsfw' as NSFW,
so we no longer need to have this check.
tags/2.0
FiniteReality 7 years ago
parent
commit
683b3f2701
3 changed files with 7 additions and 5 deletions
  1. +2
    -0
      src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
  2. +4
    -4
      src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs
  3. +1
    -1
      src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs

+ 2
- 0
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs View File

@@ -338,8 +338,10 @@ namespace Discord.Rest
return author;
}

[Obsolete("Use channel.IsNsfw instead")]
public static bool IsNsfw(IChannel channel)
=> IsNsfw(channel.Name);
[Obsolete("Use Channel.IsNsfw instead")]
public static bool IsNsfw(string channelName) =>
channelName == "nsfw" || channelName.StartsWith("nsfw-");
}


+ 4
- 4
src/Discord.Net.Rest/Entities/Channels/RestTextChannel.cs View File

@@ -17,7 +17,7 @@ namespace Discord.Rest
public string Mention => MentionUtils.MentionChannel(Id);

private bool _nsfw;
public bool IsNsfw => _nsfw || ChannelHelper.IsNsfw(this);
public bool IsNsfw => _nsfw;

internal RestTextChannel(BaseDiscordClient discord, IGuild guild, ulong id)
: base(discord, guild, id)
@@ -47,7 +47,7 @@ namespace Discord.Rest
=> ChannelHelper.GetUserAsync(this, Guild, Discord, id, options);
public IAsyncEnumerable<IReadOnlyCollection<RestGuildUser>> GetUsersAsync(RequestOptions options = null)
=> ChannelHelper.GetUsersAsync(this, Guild, Discord, null, null, options);
public Task<RestMessage> GetMessageAsync(ulong id, RequestOptions options = null)
=> ChannelHelper.GetMessageAsync(this, Discord, id, options);
public IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null)
@@ -89,7 +89,7 @@ namespace Discord.Rest
=> ChannelHelper.GetWebhookAsync(this, Discord, id, options);
public Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions options = null)
=> ChannelHelper.GetWebhooksAsync(this, Discord, options);
public Task<ICategoryChannel> GetCategoryAsync(RequestOptions options = null)
=> ChannelHelper.GetCategoryAsync(this, Discord, options);

@@ -118,7 +118,7 @@ namespace Discord.Rest
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IMessage>>();
}
IAsyncEnumerable<IReadOnlyCollection<IMessage>> IMessageChannel.GetMessagesAsync(ulong fromMessageId, Direction dir, int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)


+ 1
- 1
src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs View File

@@ -21,7 +21,7 @@ namespace Discord.WebSocket
=> CategoryId.HasValue ? Guild.GetChannel(CategoryId.Value) as ICategoryChannel : null;

private bool _nsfw;
public bool IsNsfw => _nsfw || ChannelHelper.IsNsfw(this);
public bool IsNsfw => _nsfw;

public string Mention => MentionUtils.MentionChannel(Id);
public IReadOnlyCollection<SocketMessage> CachedMessages => _messages?.Messages ?? ImmutableArray.Create<SocketMessage>();


Loading…
Cancel
Save