From 9ad1dad6dfb68cdf73c08e73bcbfed3b7fbf1270 Mon Sep 17 00:00:00 2001
From: TC <th-ch@users.noreply.github.com>
Date: Tue, 12 Jan 2021 22:54:04 +0100
Subject: [PATCH] Use contextBridge in preload script + update navigation
 plugin

---
 plugins/navigation/actions.js             | 24 +++++++++++------------
 plugins/navigation/back.js                |  8 ++++----
 plugins/navigation/templates/back.html    |  2 +-
 plugins/navigation/templates/forward.html |  2 +-
 preload.js                                |  8 +++-----
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/plugins/navigation/actions.js b/plugins/navigation/actions.js
index 83947a632e..69c8536b79 100644
--- a/plugins/navigation/actions.js
+++ b/plugins/navigation/actions.js
@@ -1,24 +1,24 @@
-const { triggerAction } = require('../utils');
+const { triggerAction } = require("../utils");
 
 const CHANNEL = "navigation";
 const ACTIONS = {
-    NEXT: "next",
-    BACK: 'back',
-}
+	NEXT: "next",
+	BACK: "back",
+};
 
 function goToNextPage() {
-    triggerAction(CHANNEL, ACTIONS.NEXT);
+	triggerAction(CHANNEL, ACTIONS.NEXT);
 }
 
 function goToPreviousPage() {
-    triggerAction(CHANNEL, ACTIONS.BACK);
+	triggerAction(CHANNEL, ACTIONS.BACK);
 }
 
 module.exports = {
-    CHANNEL: CHANNEL,
-    ACTIONS: ACTIONS,
-    global: {
-        goToNextPage: goToNextPage,
-        goToPreviousPage: goToPreviousPage,
-    }
+	CHANNEL: CHANNEL,
+	ACTIONS: ACTIONS,
+	actions: {
+		goToNextPage: goToNextPage,
+		goToPreviousPage: goToPreviousPage,
+	},
 };
diff --git a/plugins/navigation/back.js b/plugins/navigation/back.js
index 54ee18a77d..6d0d0a2a4d 100644
--- a/plugins/navigation/back.js
+++ b/plugins/navigation/back.js
@@ -1,23 +1,23 @@
 const path = require("path");
 
 const { injectCSS, listenAction } = require("../utils");
-const { ACTIONS, CHANNEL }        = require("./actions.js");
+const { ACTIONS, CHANNEL } = require("./actions.js");
 
 function handle(win) {
 	injectCSS(win.webContents, path.join(__dirname, "style.css"));
 	listenAction(CHANNEL, (event, action) => {
 		switch (action) {
-			case ACTIONS.NEXT: 
+			case ACTIONS.NEXT:
 				if (win.webContents.canGoForward()) {
 					win.webContents.goForward();
 				}
 				break;
-			case ACTIONS.BACK: 
+			case ACTIONS.BACK:
 				if (win.webContents.canGoBack()) {
 					win.webContents.goBack();
 				}
 				break;
-			default: 
+			default:
 				console.log("Unknown action: " + action);
 		}
 	});
diff --git a/plugins/navigation/templates/back.html b/plugins/navigation/templates/back.html
index 2a67516361..e37d2284c7 100644
--- a/plugins/navigation/templates/back.html
+++ b/plugins/navigation/templates/back.html
@@ -2,7 +2,7 @@
 	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
 	tab-id="FEmusic_back"
 	role="tab"
-	onclick="goToPreviousPage()"
+	onclick="navigationActions.goToPreviousPage()"
 >
 	<div
 		class="search-icon style-scope ytmusic-search-box"
diff --git a/plugins/navigation/templates/forward.html b/plugins/navigation/templates/forward.html
index b3837b3622..5acd86ed9b 100644
--- a/plugins/navigation/templates/forward.html
+++ b/plugins/navigation/templates/forward.html
@@ -2,7 +2,7 @@
 	class="style-scope ytmusic-pivot-bar-renderer navigation-item"
 	tab-id="FEmusic_next"
 	role="tab"
-	onclick="goToNextPage()"
+	onclick="navigationActions.goToNextPage()"
 >
 	<div
 		class="search-icon style-scope ytmusic-search-box"
diff --git a/preload.js b/preload.js
index 362c917032..638d62d306 100644
--- a/preload.js
+++ b/preload.js
@@ -1,6 +1,6 @@
 const path = require("path");
 
-const { remote } = require("electron");
+const { contextBridge, remote } = require("electron");
 
 const config = require("./config");
 const { fileExists } = require("./plugins/utils");
@@ -10,10 +10,8 @@ const plugins = config.plugins.getEnabled();
 plugins.forEach(([plugin, options]) => {
 	const pluginPath = path.join(__dirname, "plugins", plugin, "actions.js");
 	fileExists(pluginPath, () => {
-		const actions = require(pluginPath).global || {};
-		Object.keys(actions).forEach((actionName) => {
-			global[actionName] = actions[actionName];
-		});
+		const actions = require(pluginPath).actions || {};
+		contextBridge.exposeInMainWorld(plugin + "Actions", actions);
 	});
 });