Use cancelTokens in LargeServerDownloader

src/Discord.Net.Shared/TaskExtensions.cs

@@ -53,15 +53,15 @@ namespace Discord
             }
         }
 
-        public static async Task Wait(this CancellationTokenSource tokenSource)
+        public static async Task Wait(this CancellationTokenSource cancelTokenSource)
         {
-            var token = tokenSource.Token;
-            try { await Task.Delay(-1, token).ConfigureAwait(false); }
+            var cancelToken = cancelTokenSource.Token;
+            try { await Task.Delay(-1, cancelToken).ConfigureAwait(false); }
             catch (OperationCanceledException) { } //Expected
         }
-        public static async Task Wait(this CancellationToken token)
+        public static async Task Wait(this CancellationToken cancelToken)
         {
-            try { await Task.Delay(-1, token).ConfigureAwait(false); }
+            try { await Task.Delay(-1, cancelToken).ConfigureAwait(false); }
             catch (OperationCanceledException) { } //Expected
         }
     }

src/Discord.Net/DiscordClient.cs

@@ -1079,7 +1079,7 @@ namespace Discord
                     ulong[] serverIds = new ulong[batchSize];
 
                     while (!cancelToken.IsCancellationRequested && State == ConnectionState.Connecting)
-                        await Task.Delay(100).ConfigureAwait(false);
+                        await Task.Delay(1000, cancelToken).ConfigureAwait(false);
 
                     while (!cancelToken.IsCancellationRequested && State == ConnectionState.Connected)
                     {
@@ -1092,7 +1092,7 @@ namespace Discord
                             if (count > 0)
                                 GatewaySocket.SendRequestMembers(serverIds.Take(count), "", 0);
                         }
-                        await Task.Delay(1250).ConfigureAwait(false);
+                        await Task.Delay(1250, cancelToken).ConfigureAwait(false);
                     }
                 }
                 catch (OperationCanceledException) { }