Merge pull request #71 from a-liashenko/feature/update_electron

Fix openExternal in renderer process
marckohlbrugge · Jul 10, 2023 · f06b7c7 · f06b7c7
2 parents 85e7047 + f2ef5e0
commit f06b7c7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/ipc/channels.js b/src/ipc/channels.js
@@ -4,5 +4,6 @@ exports.Channels = {
   FetchHashtags: 'app/fetch/hashtags',
   Log: 'app/log',
   StoreGet: 'app/store/get',
-  StoreGetMultiple: 'app/store/get_multi',
+  StoreGetMultiple: 'app/store/getMulti',
+  OpenExternalUrl: 'app/shell/openExternalUrl',
 };
diff --git a/src/ipc/main.js b/src/ipc/main.js
@@ -1,4 +1,4 @@
-const { ipcMain, BrowserWindow } = require('electron');
+const { ipcMain, BrowserWindow, shell } = require('electron');
 const logger = require('../logger');
 const store = require('../store');
 
@@ -27,6 +27,10 @@ ipcMain.handle(Channels.StoreGetMultiple, async (event, ...args) => {
   return Promise.resolve(result);
 });
 
+ipcMain.on(Channels.OpenExternalUrl, async (event, url) => {
+  shell.openExternal(url);
+});
+
 ipcMain.on(Channels.Log, async (event, level, ...args) => {
   const levels = { log: logger.log, warn: logger.warn };
   let fn = levels[level] || logger.log;

diff --git a/src/preload.js b/src/preload.js
@@ -1,4 +1,4 @@
-const { ipcRenderer, shell, contextBridge } = require('electron');
+const { ipcRenderer, contextBridge } = require('electron');
 const utils = require('./ipc/renderer');
 const { Channels } = require('./ipc/channels');
 
@@ -10,7 +10,9 @@ function logGeneric(level, ...args) {
 
 const context = {
   electron: {
-    shell,
+    shell: {
+      openExternal: (url) => ipcRenderer.send(Channels.OpenExternalUrl, url),
+    },
     ipcRenderer: {
       send: ipcRenderer.send,
       invoke: ipcRenderer.invoke,