From 0e83265ec1131cba2822da6235a2f5a0e3c86940 Mon Sep 17 00:00:00 2001
From: Still Hsu <341464@gmail.com>
Date: Sat, 21 Jul 2018 03:07:01 +0800
Subject: [PATCH] Change all Select(... as ...) to OfType

---
 src/Discord.Net.Core/Extensions/DiscordClientExtensions.cs | 4 ++--
 src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs          | 6 +++---
 src/Discord.Net.WebSocket/DiscordSocketClient.cs           | 4 ++--
 src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Discord.Net.Core/Extensions/DiscordClientExtensions.cs b/src/Discord.Net.Core/Extensions/DiscordClientExtensions.cs
index ff3c7caf7..81cd10b49 100644
--- a/src/Discord.Net.Core/Extensions/DiscordClientExtensions.cs
+++ b/src/Discord.Net.Core/Extensions/DiscordClientExtensions.cs
@@ -12,12 +12,12 @@ namespace Discord
         public static async Task<IDMChannel> GetDMChannelAsync(this IDiscordClient client, ulong id)
             => await client.GetPrivateChannelAsync(id).ConfigureAwait(false) as IDMChannel;
         public static async Task<IEnumerable<IDMChannel>> GetDMChannelsAsync(this IDiscordClient client)
-            => (await client.GetPrivateChannelsAsync().ConfigureAwait(false)).Select(x => x as IDMChannel).Where(x => x != null);
+            => (await client.GetPrivateChannelsAsync().ConfigureAwait(false)).OfType<IDMChannel>();
 
         public static async Task<IGroupChannel> GetGroupChannelAsync(this IDiscordClient client, ulong id)
             => await client.GetPrivateChannelAsync(id).ConfigureAwait(false) as IGroupChannel;
         public static async Task<IEnumerable<IGroupChannel>> GetGroupChannelsAsync(this IDiscordClient client)
-            => (await client.GetPrivateChannelsAsync().ConfigureAwait(false)).Select(x => x as IGroupChannel).Where(x => x != null);
+            => (await client.GetPrivateChannelsAsync().ConfigureAwait(false)).OfType<IGroupChannel>();
 
         public static async Task<IVoiceRegion> GetOptimalVoiceRegionAsync(this IDiscordClient discord)
         {
diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
index 9bf13fa07..e6819e8a4 100644
--- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
+++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
@@ -168,7 +168,7 @@ namespace Discord.Rest
         public async Task<IReadOnlyCollection<RestTextChannel>> GetTextChannelsAsync(RequestOptions options = null)
         {
             var channels = await GuildHelper.GetChannelsAsync(this, Discord, options).ConfigureAwait(false);
-            return channels.Select(x => x as RestTextChannel).Where(x => x != null).ToImmutableArray();
+            return channels.OfType<RestTextChannel>().ToImmutableArray();
         }
         public async Task<RestVoiceChannel> GetVoiceChannelAsync(ulong id, RequestOptions options = null)
         {
@@ -178,12 +178,12 @@ namespace Discord.Rest
         public async Task<IReadOnlyCollection<RestVoiceChannel>> GetVoiceChannelsAsync(RequestOptions options = null)
         {
             var channels = await GuildHelper.GetChannelsAsync(this, Discord, options).ConfigureAwait(false);
-            return channels.Select(x => x as RestVoiceChannel).Where(x => x != null).ToImmutableArray();
+            return channels.OfType<RestVoiceChannel>().ToImmutableArray();
         }
         public async Task<IReadOnlyCollection<RestCategoryChannel>> GetCategoryChannelsAsync(RequestOptions options = null)
         {
             var channels = await GuildHelper.GetChannelsAsync(this, Discord, options).ConfigureAwait(false);
-            return channels.Select(x => x as RestCategoryChannel).Where(x => x != null).ToImmutableArray();
+            return channels.OfType<RestCategoryChannel>().ToImmutableArray();
         }
 
         public async Task<RestVoiceChannel> GetAFKChannelAsync(RequestOptions options = null)
diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 9efc7d3fa..4911cc39e 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -63,9 +63,9 @@ namespace Discord.WebSocket
         public override IReadOnlyCollection<SocketGuild> Guilds => State.Guilds;
         public override IReadOnlyCollection<ISocketPrivateChannel> PrivateChannels => State.PrivateChannels;
         public IReadOnlyCollection<SocketDMChannel> DMChannels
-            => State.PrivateChannels.Select(x => x as SocketDMChannel).Where(x => x != null).ToImmutableArray();
+            => State.PrivateChannels.OfType<SocketDMChannel>().ToImmutableArray();
         public IReadOnlyCollection<SocketGroupChannel> GroupChannels
-            => State.PrivateChannels.Select(x => x as SocketGroupChannel).Where(x => x != null).ToImmutableArray();
+            => State.PrivateChannels.OfType<SocketGroupChannel>().ToImmutableArray();
         public override IReadOnlyCollection<RestVoiceRegion> VoiceRegions => _voiceRegions.ToReadOnlyCollection();
 
         /// <summary> Creates a new REST/WebSocket discord client. </summary>
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
index bf33ef569..8c9b81ebb 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
+++ b/src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs
@@ -91,11 +91,11 @@ namespace Discord.WebSocket
             }
         }
         public IReadOnlyCollection<SocketTextChannel> TextChannels
-            => Channels.Select(x => x as SocketTextChannel).Where(x => x != null).ToImmutableArray();
+            => Channels.OfType<SocketTextChannel>().ToImmutableArray();
         public IReadOnlyCollection<SocketVoiceChannel> VoiceChannels
-            => Channels.Select(x => x as SocketVoiceChannel).Where(x => x != null).ToImmutableArray();
+            => Channels.OfType<SocketVoiceChannel>().ToImmutableArray();
         public IReadOnlyCollection<SocketCategoryChannel> CategoryChannels
-            => Channels.Select(x => x as SocketCategoryChannel).Where(x => x != null).ToImmutableArray();
+            => Channels.OfType<SocketCategoryChannel>().ToImmutableArray();
         public SocketGuildUser CurrentUser => _members.TryGetValue(Discord.CurrentUser.Id, out SocketGuildUser member) ? member : null;
         public SocketRole EveryoneRole => GetRole(Id);
         public IReadOnlyCollection<SocketGuildChannel> Channels