From 90ac9027cf41238dd782770bfb773b14a4283f07 Mon Sep 17 00:00:00 2001 From: Sindre Langhus Date: Mon, 1 May 2017 02:29:12 +0200 Subject: [PATCH] Replace Where+FirstOrDefault with FirstOrDefault in SocketClient (#636) * Replace Where.FirstOrDefault with FirstOrDefault * Replace Where+FirstOrDefault in ClientHelper --- src/Discord.Net.Rest/ClientHelper.cs | 2 +- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net.Rest/ClientHelper.cs b/src/Discord.Net.Rest/ClientHelper.cs index a1fedb113..8bc800a7d 100644 --- a/src/Discord.Net.Rest/ClientHelper.cs +++ b/src/Discord.Net.Rest/ClientHelper.cs @@ -150,7 +150,7 @@ namespace Discord.Rest string id, RequestOptions options) { var models = await client.ApiClient.GetVoiceRegionsAsync(options).ConfigureAwait(false); - return models.Select(x => RestVoiceRegion.Create(client, x)).Where(x => x.Id == id).FirstOrDefault(); + return models.Select(x => RestVoiceRegion.Create(client, x)).FirstOrDefault(x => x.Id == id); } } } diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs index a8543f108..5e19e14e6 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -267,7 +267,7 @@ namespace Discord.WebSocket /// public SocketUser GetUser(string username, string discriminator) { - return State.Users.Where(x => x.Discriminator == discriminator && x.Username == username).FirstOrDefault(); + return State.Users.FirstOrDefault(x => x.Discriminator == discriminator && x.Username == username); } internal SocketGlobalUser GetOrCreateUser(ClientState state, Discord.API.User model) {