From 8f53086499b2dd62817d582b081f9ab1a095ad4b Mon Sep 17 00:00:00 2001
From: Christopher F <foxbot@protonmail.com>
Date: Wed, 22 Nov 2017 18:19:04 -0500
Subject: [PATCH] Allow opting in to proxies on the WebSocket

---
 .../Net/DefaultWebSocketClient.cs             |  7 ++++--
 .../Net/DefaultWebSocketClientProvider.cs     | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs b/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs
index 282ae210a..a250acec9 100644
--- a/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs
+++ b/src/Discord.Net.WebSocket/Net/DefaultWebSocketClient.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
+using System.Net;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
@@ -23,18 +24,20 @@ namespace Discord.Net.WebSockets
         private readonly SemaphoreSlim _lock;
         private readonly Dictionary<string, string> _headers;
         private ClientWebSocket _client;
+        private IWebProxy _proxy;
         private Task _task;
         private CancellationTokenSource _cancelTokenSource;
         private CancellationToken _cancelToken, _parentToken;
         private bool _isDisposed, _isDisconnecting;
 
-        public DefaultWebSocketClient()
+        public DefaultWebSocketClient(IWebProxy proxy = null)
         {
             _lock = new SemaphoreSlim(1, 1);
             _cancelTokenSource = new CancellationTokenSource();
             _cancelToken = CancellationToken.None;
             _parentToken = CancellationToken.None;
             _headers = new Dictionary<string, string>();
+            _proxy = proxy;
         }
         private void Dispose(bool disposing)
         {
@@ -70,7 +73,7 @@ namespace Discord.Net.WebSockets
             _cancelToken = CancellationTokenSource.CreateLinkedTokenSource(_parentToken, _cancelTokenSource.Token).Token;
 
             _client = new ClientWebSocket();
-            _client.Options.Proxy = null;
+            _client.Options.Proxy = _proxy;
             _client.Options.KeepAliveInterval = TimeSpan.Zero;
             foreach (var header in _headers)
             {
diff --git a/src/Discord.Net.WebSocket/Net/DefaultWebSocketClientProvider.cs b/src/Discord.Net.WebSocket/Net/DefaultWebSocketClientProvider.cs
index 04b3f8388..68bd67c5b 100644
--- a/src/Discord.Net.WebSocket/Net/DefaultWebSocketClientProvider.cs
+++ b/src/Discord.Net.WebSocket/Net/DefaultWebSocketClientProvider.cs
@@ -1,21 +1,27 @@
 using System;
+using System.Net;
 
 namespace Discord.Net.WebSockets
 {
     public static class DefaultWebSocketProvider
     {
 #if DEFAULTWEBSOCKET
-        public static readonly WebSocketProvider Instance = () => 
+        public static readonly WebSocketProvider Instance = Create();
+
+        public static WebSocketProvider Create(IWebProxy proxy = null)
         {
-            try
-            {
-                return new DefaultWebSocketClient();                    
-            }
-            catch (PlatformNotSupportedException ex)
+            return () =>
             {
-                throw new PlatformNotSupportedException("The default WebSocketProvider is not supported on this platform.", ex);
-            }
-        };
+                try
+                {
+                    return new DefaultWebSocketClient(proxy);
+                }
+                catch (PlatformNotSupportedException ex)
+                {
+                    throw new PlatformNotSupportedException("The default WebSocketProvider is not supported on this platform.", ex);
+                }
+            };
+        }
 #else
         public static readonly WebSocketProvider Instance = () =>
         {