From 80d7ef19dbb4271416bd8b5bbf938e180c57e5f3 Mon Sep 17 00:00:00 2001
From: Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>
Date: Wed, 12 May 2021 01:26:51 +0530
Subject: Method reuse (#1379)

* Used already exported common functions to avoid the same logic being repeated.

* Use a different package to retrieve the os-name for the 'About Dialog'.
---
 src/components/settings/settings/EditSettingsForm.js |  8 ++++----
 src/electron/ipc-api/appIndicator.js                 | 14 +++++++-------
 src/electron/ipc-api/autoUpdate.js                   |  3 ++-
 src/helpers/userAgent-helpers.js                     |  2 +-
 src/index.js                                         |  7 ++++---
 src/lib/DBus.js                                      |  8 ++------
 src/lib/Menu.js                                      |  5 ++++-
 src/lib/Tray.js                                      | 16 ++++++----------
 src/webview/contextMenuBuilder.js                    |  4 +++-
 9 files changed, 33 insertions(+), 34 deletions(-)

(limited to 'src')

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({
-- 
cgit v1.2.3-70-g09d2