From e50281f11c7f4896c47e780d951913f2f141791c Mon Sep 17 00:00:00 2001
From: TheraNinjaCat <23611633+TheraNinjaCat@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:25:51 +1300
Subject: [PATCH] Added the ability to specify a proxy for electron to connect
 through in the config.json file.

---
 src/electron-main.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/electron-main.js b/src/electron-main.js
index 2cd6c66a..f2dc4707 100644
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -696,7 +696,17 @@ app.on('ready', async () => {
             spellcheck: true,
         },
     });
-    mainWindow.loadURL('vector://vector/webapp/');
+
+    if (vectorConfig['proxy']) {
+      console.log(`Starting electron through proxy: ${vectorConfig['proxy']}`);
+      mainWindow.webContents.session.setProxy({proxyRules: vectorConfig['proxy']})
+      .then(() => {
+        mainWindow.loadURL('vector://vector/webapp/');
+      });
+    } else {
+      mainWindow.loadURL('vector://vector/webapp/');
+    }
+
     Menu.setApplicationMenu(vectorMenu);
 
     // Create trayIcon icon