From 95df3522a15631abc51a4295cae0ea401a8d4e1e Mon Sep 17 00:00:00 2001
From: Markus Hatvan <markus_hatvan@aon.at>
Date: Tue, 14 Sep 2021 19:58:52 +0200
Subject: feat: add eslint-plugin-unicorn (#1936)

---
 src/electron/ipc-api/appIndicator.ts |  4 +---
 src/electron/ipc-api/autoUpdate.ts   |  4 ++--
 src/electron/ipc-api/cld.ts          |  4 ++--
 src/electron/ipc-api/dnd.ts          |  4 ++--
 src/electron/ipc-api/download.ts     | 10 +++++-----
 5 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/electron/ipc-api')

diff --git a/src/electron/ipc-api/appIndicator.ts b/src/electron/ipc-api/appIndicator.ts
index 5b5f2bac7..a51ed8161 100644
--- a/src/electron/ipc-api/appIndicator.ts
+++ b/src/electron/ipc-api/appIndicator.ts
@@ -34,8 +34,7 @@ export default params => {
 
   ipcMain.on('updateAppIndicator', (_event, args) => {
     // Flash TaskBar for windows, bounce Dock on Mac
-    if (!(app as any).mainWindow.isFocused()) {
-      if (params.settings.app.get('notifyTaskBarOnMessage')) {
+    if (!(app as any).mainWindow.isFocused() && params.settings.app.get('notifyTaskBarOnMessage')) {
         if (isWindows) {
           (app as any).mainWindow.flashFrame(true);
           (app as any).mainWindow.once('focus', () =>
@@ -45,7 +44,6 @@ export default params => {
           app.dock.bounce('informational');
         }
       }
-    }
 
     // Update badge
     if (isMac && typeof args.indicator === 'string') {
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index 70890539d..31c614ab7 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -44,8 +44,8 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
               app.quit();
             }, 20);
           }
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           event.sender.send('autoUpdate', { error: true });
         }
       }
diff --git a/src/electron/ipc-api/cld.ts b/src/electron/ipc-api/cld.ts
index b907f3730..4221f9b22 100644
--- a/src/electron/ipc-api/cld.ts
+++ b/src/electron/ipc-api/cld.ts
@@ -16,8 +16,8 @@ export default async () => {
 
         return result.languages[0].code;
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     }
   });
 };
diff --git a/src/electron/ipc-api/dnd.ts b/src/electron/ipc-api/dnd.ts
index 6fb8999a3..afaef9a66 100644
--- a/src/electron/ipc-api/dnd.ts
+++ b/src/electron/ipc-api/dnd.ts
@@ -15,8 +15,8 @@ export default async () => {
       const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
       return false;
     }
   });
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
index 822658f26..af15b157e 100644
--- a/src/electron/ipc-api/download.ts
+++ b/src/electron/ipc-api/download.ts
@@ -7,7 +7,7 @@ import { PathLike } from 'fs';
 const debug = require('debug')('Ferdi:ipcApi:download');
 
 function decodeBase64Image(dataString: string) {
-  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
+  const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/);
 
   if (matches?.length !== 3) {
     return new Error('Invalid input string');
@@ -47,12 +47,12 @@ export default (params: { mainWindow: BrowserWindow }) => {
             );
 
             debug('File blob saved to', saveDialog.filePath);
-          } catch (err) {
-            console.log(err);
+          } catch (error) {
+            console.log(error);
           }
         }
-      } catch (e) {
-        console.error(e);
+      } catch (error) {
+        console.error(error);
       }
     },
   );
-- 
cgit v1.2.3-54-g00ecf