From 0a068bb63c06860426ac5716eb14e8c49cb963b7 Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Fri, 8 Apr 2016 16:08:56 -0300
Subject: [PATCH] PR cleanup, adjusting delay times

---
 src/Discord.Net.Audio/Net/VoiceSocket.cs |  6 +-----
 src/Discord.Net/DiscordClient.cs         | 17 ++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Discord.Net.Audio/Net/VoiceSocket.cs b/src/Discord.Net.Audio/Net/VoiceSocket.cs
index 5cf0ed209..91f95890c 100644
--- a/src/Discord.Net.Audio/Net/VoiceSocket.cs
+++ b/src/Discord.Net.Audio/Net/VoiceSocket.cs
@@ -418,11 +418,7 @@ namespace Discord.Net.WebSockets
                             var payload = (msg.Payload as JToken).ToObject<ReadyEvent>(_serializer);
                             _heartbeatInterval = payload.HeartbeatInterval;
                             _ssrc = payload.SSRC;
-                            string hostname;
-                            if (Host.Contains("?"))
-                                hostname = Host.Substring(0, Host.IndexOf('?')).Replace("wss://", "");
-                            else
-                                hostname = Host.Replace("wss://", "");
+                            string hostname = Host.Replace("wss://", "");
                             var address = (await Dns.GetHostAddressesAsync(hostname).ConfigureAwait(false)).FirstOrDefault();
                             _endpoint = new IPEndPoint(address, payload.Port);
 
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index 4862206e7..016f7ae9d 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -529,22 +529,21 @@ namespace Discord
                                 try
                                 {
                                     const short batchSize = 50;
-                                    int largeServersCount = 0;
-                                    await Task.Delay(2500, cancelToken);
+                                    int count = 0;
+                                    await Task.Delay(1500, cancelToken);
                                     do
                                     {
-                                        largeServersCount = 0;
+                                        count = 0;
                                         ulong[] serverIds = new ulong[batchSize];
-                                        while (largeServersCount < batchSize && _largeServers.TryDequeue(out serverIds[largeServersCount++])) { }
-                                        if (largeServersCount > 0)
+                                        while (count < batchSize && _largeServers.TryDequeue(out serverIds[count++])) { }
+                                        if (count > 0)
                                         {
-                                            Logger.Verbose($"Downloading data for {largeServersCount} large servers.");
                                             cancelToken.ThrowIfCancellationRequested();
                                             GatewaySocket.SendRequestMembers(serverIds, "", 0);
-                                            await Task.Delay(1500, cancelToken);
+                                            await Task.Delay(1250, cancelToken);
                                         }
-                                    } while (largeServersCount == batchSize);
-                                    await Task.Delay(2500, cancelToken);
+                                    } while (count == batchSize);
+                                    await Task.Delay(1500, cancelToken);
                                     EndConnect();
                                 }
                                 catch (OperationCanceledException) { }