1 files changed, 45 insertions, 46 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index e4056e536..5a99299c5 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,12 +1,10 @@
-import { clipboard, shell } from 'electron';
-import {
-  app, Menu, dialog, systemPreferences,
-} from '@electron/remote';
+import { clipboard } from 'electron';
+import { app, Menu, dialog, systemPreferences } from '@electron/remote';
 import { autorun, observable } from 'mobx';
 import { defineMessages } from 'react-intl';
 import { CUSTOM_WEBSITE_RECIPE_ID, GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config';
 import {
-  shortcutKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey,
+  cmdOrCtrlShortcutKey, altKey, shiftKey, settingsShortcutKey, isLinux, isMac, aboutAppDetails, lockFerdiShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, addNewServiceShortcutKey, muteFerdiShortcutKey,
 } from '../environment';
 import { announcementsStore } from '../features/announcements';
 import { announcementActions } from '../features/announcements/actions';
@@ -15,6 +13,7 @@ import { todoActions } from '../features/todos/actions';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
 import apiBase, { termsBase } from '../api/apiBase';
+import { openExternalUrl } from '../helpers/url-helpers';
 
 const menuItems = defineMessages({
   edit: {
@@ -318,7 +317,7 @@ function getActiveWebview() {
 const _titleBarTemplateFactory = (intl, locked) => [
   {
     label: intl.formatMessage(menuItems.edit),
-    accelerator: `${altKey}+E`,
+    accelerator: `${altKey()}+E`,
     submenu: [
       {
         label: intl.formatMessage(menuItems.undo),
@@ -333,22 +332,22 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.cut),
-        accelerator: `${shortcutKey()}+X`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+X`,
         role: 'cut',
       },
       {
         label: intl.formatMessage(menuItems.copy),
-        accelerator: `${shortcutKey()}+C`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+C`,
         role: 'copy',
       },
       {
         label: intl.formatMessage(menuItems.paste),
-        accelerator: `${shortcutKey()}+V`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+V`,
         role: 'paste',
       },
       {
         label: intl.formatMessage(menuItems.pasteAndMatchStyle),
-        accelerator: `${shortcutKey()}+${shiftKey}+V`, // Override the accelerator since this adds new key combo in macos
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+V`, // Override the accelerator since this adds new key combo in macos
         role: 'pasteAndMatchStyle',
         click() {
           getActiveWebview().pasteAndMatchStyle();
@@ -360,14 +359,14 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.selectAll),
-        accelerator: `${shortcutKey()}+A`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+A`,
         role: 'selectall',
       },
     ],
   },
   {
     label: intl.formatMessage(menuItems.view),
-    accelerator: `${altKey}+V`,
+    accelerator: `${altKey()}+V`,
     visible: !locked,
     submenu: [
       {
@@ -375,7 +374,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.openQuickSwitch),
-        accelerator: `${shortcutKey()}+S`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+S`,
         click() {
           window.ferdi.features.quickSwitch.state.isModalVisible = true;
         },
@@ -385,7 +384,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.findInPage),
-        accelerator: `${shortcutKey()}+F`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+F`,
         click() {
           // Check if there is a service active
           if (!window.ferdi.stores.services.active) return;
@@ -406,14 +405,14 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.back),
-        accelerator: `${shortcutKey()}+Left`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+Left`,
         click() {
           getActiveWebview().goBack();
         },
       },
       {
         label: intl.formatMessage(menuItems.forward),
-        accelerator: `${shortcutKey()}+Right`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+Right`,
         click() {
           getActiveWebview().goForward();
         },
@@ -423,7 +422,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.resetZoom),
-        accelerator: `${shortcutKey()}+0`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+0`,
         role: 'resetZoom',
         click() {
           getActiveWebview().setZoomLevel(0);
@@ -431,7 +430,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        accelerator: `${shortcutKey()}+plus`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+plus`,
         role: 'zoomIn',
         click() {
           const activeService = getActiveWebview();
@@ -443,7 +442,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.zoomOut),
-        accelerator: `${shortcutKey()}+-`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+-`,
         role: 'zoomOut',
         click() {
           const activeService = getActiveWebview();
@@ -463,7 +462,7 @@ const _titleBarTemplateFactory = (intl, locked) => [
       {
         label: intl.formatMessage(menuItems.toggleDarkMode),
         type: 'checkbox',
-        accelerator: `${shortcutKey()}+${shiftKey}+D`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+D`,
         checked: window.ferdi.stores.settings.app.darkMode,
         click: () => {
           window.ferdi.actions.settings.update({
@@ -478,13 +477,13 @@ const _titleBarTemplateFactory = (intl, locked) => [
   },
   {
     label: intl.formatMessage(menuItems.services),
-    accelerator: `${altKey}+S`,
+    accelerator: `${altKey()}+S`,
     visible: !locked,
     submenu: [],
   },
   {
     label: intl.formatMessage(menuItems.workspaces),
-    accelerator: `${altKey}+W`,
+    accelerator: `${altKey()}+W`,
     submenu: [],
     visible: !locked && workspaceStore.isFeatureEnabled,
   },
@@ -509,20 +508,20 @@ const _titleBarTemplateFactory = (intl, locked) => [
   },
   {
     label: intl.formatMessage(menuItems.help),
-    accelerator: `${altKey}+H`,
+    accelerator: `${altKey()}+H`,
     role: 'help',
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal(LIVE_API_FERDI_WEBSITE); },
+        click() { openExternalUrl(LIVE_API_FERDI_WEBSITE, true); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
-        click() { shell.openExternal(`${GITHUB_FERDI_URL}/ferdi/blob/master/CHANGELOG.md`); },
+        click() { openExternalUrl(`${GITHUB_FERDI_URL}/ferdi/blob/develop/CHANGELOG.md`, true); },
       },
       {
         label: intl.formatMessage(menuItems.importExportData),
-        click() { shell.openExternal(apiBase(false)); },
+        click() { openExternalUrl(apiBase(false), true); },
         enabled: !locked,
       },
       {
@@ -540,18 +539,18 @@ const _titleBarTemplateFactory = (intl, locked) => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal(`${LIVE_API_FERDI_WEBSITE}/contact`); },
+        click() { openExternalUrl(`${LIVE_API_FERDI_WEBSITE}/contact`, true); },
       },
       {
         type: 'separator',
       },
       {
         label: intl.formatMessage(menuItems.tos),
-        click() { shell.openExternal(`${termsBase()}/terms`); },
+        click() { openExternalUrl(`${termsBase()}/terms`, true); },
       },
       {
         label: intl.formatMessage(menuItems.privacy),
-        click() { shell.openExternal(`${termsBase()}/privacy`); },
+        click() { openExternalUrl(`${termsBase()}/privacy`, true); },
       },
     ],
   },
@@ -612,13 +611,13 @@ export default class FranzMenu {
         type: 'separator',
       }, {
         label: intl.formatMessage(menuItems.toggleDevTools),
-        accelerator: `${shortcutKey()}+${altKey}+I`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+I`,
         click: (menuItem, browserWindow) => {
           browserWindow.webContents.toggleDevTools();
         },
       }, {
         label: intl.formatMessage(menuItems.toggleServiceDevTools),
-        accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+I`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+I`,
         click: () => {
           this.actions.service.openDevToolsForActiveService();
         },
@@ -628,7 +627,7 @@ export default class FranzMenu {
       if (this.stores.features.features.isTodosEnabled) {
         tpl[1].submenu.push({
           label: intl.formatMessage(menuItems.toggleTodosDevTools),
-          accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+O`,
+          accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+O`,
           click: () => {
             const webview = document.querySelector('#todos-panel webview');
             if (webview) this.actions.todos.openDevTools();
@@ -639,7 +638,7 @@ export default class FranzMenu {
       tpl[1].submenu.unshift({
         label: intl.formatMessage(menuItems.reloadService),
         id: 'reloadService', // TODO: needed?
-        accelerator: `${shortcutKey()}+R`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+R`,
         click: () => {
           if (this.stores.user.isLoggedIn
           && this.stores.services.enabled.length > 0) {
@@ -654,13 +653,13 @@ export default class FranzMenu {
         },
       }, {
         label: intl.formatMessage(menuItems.reloadFerdi),
-        accelerator: `${shortcutKey()}+${shiftKey}+R`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+R`,
         click: () => {
           window.location.reload();
         },
       }, {
         label: intl.formatMessage(menuItems.reloadTodos),
-        accelerator: `${shortcutKey()}+${shiftKey}+${altKey}+R`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+${altKey()}+R`,
         click: () => {
           this.actions.todos.reload();
         },
@@ -716,7 +715,7 @@ export default class FranzMenu {
 
     tpl.unshift({
       label: isMac ? app.name : intl.formatMessage(menuItems.file),
-      accelerator: `${altKey}+F`,
+      accelerator: `${altKey()}+F`,
       submenu: [
         {
           label: intl.formatMessage(menuItems.about),
@@ -832,7 +831,7 @@ export default class FranzMenu {
         {
           label: intl.formatMessage(menuItems.quit),
           role: 'quit',
-          accelerator: `${shortcutKey()}+Q`,
+          accelerator: `${cmdOrCtrlShortcutKey()}+Q`,
           click() {
             app.quit();
           },
@@ -883,22 +882,22 @@ export default class FranzMenu {
       type: 'separator',
     }, {
       label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${shortcutKey()}+tab`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+tab`,
       click: () => this.actions.service.setActiveNext(),
       visible: !cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activateNextService),
-      accelerator: `${shortcutKey()}+${altKey}+right`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+right`,
       click: () => this.actions.service.setActiveNext(),
       visible: cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${shortcutKey()}+${shiftKey}+tab`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+tab`,
       click: () => this.actions.service.setActivePrev(),
       visible: !cmdAltShortcutsVisibile,
     }, {
       label: intl.formatMessage(menuItems.activatePreviousService),
-      accelerator: `${shortcutKey()}+${altKey}+left`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+left`,
       click: () => this.actions.service.setActivePrev(),
       visible: cmdAltShortcutsVisibile,
     }, {
@@ -913,7 +912,7 @@ export default class FranzMenu {
 
     services.allDisplayed.forEach((service, i) => (menu.push({
       label: this._getServiceName(service),
-      accelerator: i < 9 ? `${shortcutKey()}+${i + 1}` : null,
+      accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null,
       type: 'radio',
       checked: service.isActive,
       click: () => {
@@ -930,7 +929,7 @@ export default class FranzMenu {
         type: 'separator',
       }, {
         label: intl.formatMessage(menuItems.serviceGoHome),
-        accelerator: `${shortcutKey()}+${shiftKey}+H`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+H`,
         click: () => this.actions.service.reloadActive(),
       });
     }
@@ -946,7 +945,7 @@ export default class FranzMenu {
     // Add new workspace item:
     menu.push({
       label: intl.formatMessage(menuItems.addNewWorkspace),
-      accelerator: `${shortcutKey()}+${shiftKey}+N`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+${shiftKey()}+N`,
       click: () => {
         workspaceActions.openWorkspaceSettings();
       },
@@ -975,7 +974,7 @@ export default class FranzMenu {
     // Default workspace
     menu.push({
       label: intl.formatMessage(menuItems.defaultWorkspace),
-      accelerator: `${shortcutKey()}+${altKey}+0`,
+      accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`,
       type: 'radio',
       checked: !activeWorkspace,
       click: () => {
@@ -986,7 +985,7 @@ export default class FranzMenu {
     // Workspace items
     workspaces.forEach((workspace, i) => menu.push({
       label: workspace.name,
-      accelerator: i < 9 ? `${shortcutKey()}+${altKey}+${i + 1}` : null,
+      accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${altKey()}+${i + 1}` : null,
       type: 'radio',
       checked: activeWorkspace ? workspace.id === activeWorkspace.id : false,
       click: () => {