11 files changed, 140 insertions, 36 deletions

diff --git a/package-lock.json b/package-lock.json
index f5cf5acb0..0c3e2357d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21459,8 +21459,7 @@
     "human-signals": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "dev": true
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
     },
     "humanize-ms": {
       "version": "1.2.1",
@@ -26134,6 +26133,11 @@
         }
       }
     },
+    "macos-release": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz",
+      "integrity": "sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg=="
+    },
     "macos-version": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/macos-version/-/macos-version-5.2.0.tgz",
@@ -29157,6 +29161,15 @@
         "mem": "^4.0.0"
       }
     },
+    "os-name": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.0.tgz",
+      "integrity": "sha512-caABzDdJMbtykt7GmSogEat3faTKQhmZf0BS5l/pZGmP0vPWQjXWqOhbLyK+b6j2/DQPmEvYdzLXJXXLJNVDNg==",
+      "requires": {
+        "macos-release": "^2.2.0",
+        "windows-release": "^4.0.0"
+      }
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -36185,6 +36198,97 @@
         "nan": "^2.7.0"
       }
     },
+    "windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "requires": {
+        "execa": "^4.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "execa": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+        },
+        "npm-run-path": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+          "requires": {
+            "path-key": "^3.0.0"
+          }
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "winreg": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz",
diff --git a/package.json b/package.json
index 6c73b5d8d..90405650d 100644
--- a/package.json
+++ b/package.json
@@ -106,6 +106,7 @@
     "ms": "2.1.2",
     "node-fetch": "2.6.1",
     "normalize-url": "5.0.0",
+    "os-name": "4.0.0",
     "pretty-bytes": "^5.6.0",
     "prop-types": "^15.5.10",
     "react": "16.12.0",
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index c1a99e5fc..092411ec2 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -13,7 +13,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import Input from '../../ui/Input';
 
 import { FRANZ_TRANSLATION } from '../../../config';
-import { isMac } from '../../../environment';
+import { isMac, isWindows } from '../../../environment';
 
 const {
   systemPreferences,
@@ -304,14 +304,14 @@ export default @observer class EditSettingsForm extends Component {
                 <Toggle field={form.$('enableSystemTray')} />
                 <Toggle field={form.$('reloadAfterResume')} />
                 <Toggle field={form.$('startMinimized')} />
-                {process.platform === 'win32' && (
+                {isWindows && (
                   <Toggle field={form.$('minimizeToSystemTray')} />
                 )}
-                {process.platform === 'win32' && (
+                {isWindows && (
                   <Toggle field={form.$('closeToSystemTray')} />
                 )}
                 <Toggle field={form.$('privateNotifications')} />
-                {(process.platform === 'win32' || process.platform === 'darwin') && (
+                {(isWindows || isMac) && (
                   <Toggle field={form.$('notifyTaskBarOnMessage')} />)}
                 <Select field={form.$('navigationBarBehaviour')} />
 
diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.js
index 70f14d95e..0691e5170 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.js
@@ -1,9 +1,10 @@
 import { app, ipcMain } from 'electron';
 import path from 'path';
 import { autorun } from 'mobx';
+import { isMac, isWindows, isLinux } from '../../environment';
 
 const INDICATOR_TASKBAR = 'taskbar';
-const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
+const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 
 let isTrayIconEnabled;
 
@@ -28,29 +29,28 @@ export default (params) => {
     // Flash TaskBar for windows, bounce Dock on Mac
     if (!app.mainWindow.isFocused()) {
       if (params.settings.app.get('notifyTaskBarOnMessage')) {
-        if (process.platform === 'win32') {
+        if (isWindows) {
           app.mainWindow.flashFrame(true);
           app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false));
-        } else if (process.platform === 'darwin') {
+        } else if (isMac) {
           app.dock.bounce('informational');
         }
       }
     }
 
     // Update badge
-    if (process.platform === 'darwin'
+    if (isMac
       && typeof (args.indicator) === 'string') {
       app.dock.setBadge(args.indicator);
     }
 
-    if ((process.platform === 'darwin'
-      || process.platform === 'linux')
+    if ((isMac || isLinux)
       && typeof (args.indicator) === 'number'
     ) {
       app.badgeCount = args.indicator;
     }
 
-    if (process.platform === 'win32') {
+    if (isWindows) {
       if (typeof args.indicator === 'number'
         && args.indicator !== 0) {
         params.mainWindow.setOverlayIcon(
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index a81bc918f..ec7fa9d8a 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -1,5 +1,6 @@
 import { app, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
+import { isMac, isWindows } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
@@ -9,7 +10,7 @@ export default (params) => {
   if (!enableUpdate) {
     autoUpdater.autoInstallOnAppQuit = false;
     autoUpdater.autoDownload = false;
-  } else if (process.platform === 'darwin' || process.platform === 'win32' || process.env.APPIMAGE) {
+  } else if (isMac || isWindows || process.env.APPIMAGE) {
     ipcMain.on('autoUpdate', (event, args) => {
       if (enableUpdate) {
         try {
diff --git a/src/helpers/userAgent-helpers.js b/src/helpers/userAgent-helpers.js
index be6162464..fd0d16e2d 100644
--- a/src/helpers/userAgent-helpers.js
+++ b/src/helpers/userAgent-helpers.js
@@ -5,7 +5,7 @@ import { isMac, isWindows } from '../environment';
 
 // This helper gets included from the backend and frontend but we only need to use "remote"
 // if we are in the frontend
-const ferdiVersion = remote && remote.app ? remote.app.getVersion() : app.getVersion();
+export const ferdiVersion = remote && remote.app ? remote.app.getVersion() : app.getVersion();
 
 function macOS() {
   const version = macosVersion();
diff --git a/src/index.js b/src/index.js
index a93040895..0fac386df 100644
--- a/src/index.js
+++ b/src/index.js
@@ -51,8 +51,9 @@ import {
 } from './config';
 import { asarPath } from './helpers/asar-helpers';
 import { isValidExternalURL } from './helpers/url-helpers';
-import userAgent from './helpers/userAgent-helpers';
+import userAgent, { ferdiVersion } from './helpers/userAgent-helpers';
 
+const osName = require('os-name');
 const debug = require('debug')('Ferdi:App');
 
 // From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
@@ -162,7 +163,7 @@ if (!settings.get('enableGPUAcceleration')) {
 }
 
 app.setAboutPanelOptions({
-  applicationVersion: `Version: ${app.getVersion()}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${process.platform}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
+  applicationVersion: `Version: ${ferdiVersion}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${osName()}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
   version: '',
 });
 
@@ -394,7 +395,7 @@ app.on('ready', () => {
     app.setAsDefaultProtocolClient('ferdi-dev');
   }
 
-  if (process.platform === 'win32') {
+  if (isWindows) {
     app.setUserTasks([{
       program: process.execPath,
       arguments: `${isDevMode ? `${__dirname} ` : ''}--reset-window`,
diff --git a/src/lib/DBus.js b/src/lib/DBus.js
index 957912efa..9baaea014 100644
--- a/src/lib/DBus.js
+++ b/src/lib/DBus.js
@@ -1,9 +1,5 @@
-import {
-  sessionBus,
-} from 'dbus-next';
-import {
-  isLinux,
-} from '../environment';
+import { sessionBus } from 'dbus-next';
+import { isLinux } from '../environment';
 
 export default class DBus {
   bus = null;
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index d85f5706c..7bd273f6f 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -10,6 +10,9 @@ import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
 import * as buildInfo from '../buildInfo.json'; // eslint-disable-line import/no-unresolved
+import { ferdiVersion } from '../helpers/userAgent-helpers';
+
+const osName = require('os-name');
 
 const {
   app, Menu, dialog, systemPreferences,
@@ -1025,7 +1028,7 @@ export default class FranzMenu {
           type: 'info',
           title: 'Franz Ferdinand',
           message: 'Ferdi',
-          detail: `Version: ${remote.app.getVersion()}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${process.platform}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
+          detail: `Version: ${ferdiVersion}\nElectron: ${process.versions.electron}\nNode.js: ${process.version}\nPlatform: ${osName()}\nArch: ${process.arch}\nBuild date: ${new Date(Number(buildInfo.timestamp))}\nGit SHA: ${buildInfo.gitHashShort}\nGit branch: ${buildInfo.gitBranch}`,
         });
       },
     };
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 36f0de66d..f37b4eb7b 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -3,13 +3,9 @@ import {
 } from 'electron';
 import path from 'path';
 import macosVersion from 'macos-version';
-import {
-  isMac,
-  isWindows,
-  isLinux,
-} from '../environment';
+import { isMac, isWindows, isLinux } from '../environment';
 
-const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png';
+const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 const INDICATOR_TRAY_INDIRECT = 'tray-indirect';
@@ -110,7 +106,7 @@ export default class TrayIcon {
       });
     }
 
-    if (process.platform === 'darwin') {
+    if (isMac) {
       this.themeChangeSubscriberId = systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
         this._refreshIcon();
       });
@@ -128,7 +124,7 @@ export default class TrayIcon {
     this.trayIcon.destroy();
     this.trayIcon = null;
 
-    if (process.platform === 'darwin' && this.themeChangeSubscriberId) {
+    if (isMac && this.themeChangeSubscriberId) {
       systemPreferences.unsubscribeNotification(this.themeChangeSubscriberId);
       this.themeChangeSubscriberId = null;
     }
@@ -164,7 +160,7 @@ export default class TrayIcon {
 
     this.trayIcon.setImage(this._getAsset('tray', this._getAssetFromIndicator(this.indicator)));
 
-    if (process.platform === 'darwin') {
+    if (isMac) {
       this.trayIcon.setPressedImage(
         this._getAsset('tray', `${this._getAssetFromIndicator(this.indicator)}-active`),
       );
@@ -174,7 +170,7 @@ export default class TrayIcon {
   _getAsset(type, asset) {
     let { platform } = process;
 
-    if (platform === 'darwin' && (nativeTheme.shouldUseDarkColors || macosVersion.isGreaterThanOrEqualTo('11'))) {
+    if (isMac && (nativeTheme.shouldUseDarkColors || macosVersion.isGreaterThanOrEqualTo('11'))) {
       platform = `${platform}-dark`;
     }
 
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 7980e5344..f7d552ddd 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -6,6 +6,8 @@
  *
  * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js
  */
+import { isMac } from '../environment';
+
 const {
   clipboard, nativeImage, remote, shell,
 } = require('electron');
@@ -261,7 +263,7 @@ module.exports = class ContextMenuBuilder {
       return menu;
     }
 
-    if (process.platform === 'darwin') {
+    if (isMac) {
       const webContents = this.getWebContents();
 
       const lookUpDefinition = new MenuItem({