Merge branch 'develop' into reload-crashed-service

10 files changed, 105 insertions, 108 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 8b0b7563c..932b70cdc 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -499,7 +499,7 @@ export default class ServerApi {
 
         return recipe;
       }),
-    ).catch(err => console.error(err));
+    ).catch(err => console.error('Can\'t load recipe', err));
   }
 
   _mapRecipePreviewModel(recipes) {
@@ -562,9 +562,16 @@ export default class ServerApi {
         .filter(file => fs.statSync(path.join(recipesDirectory, file)).isDirectory() && file !== 'temp');
 
       const recipes = paths.map((id) => {
-        // eslint-disable-next-line
-        const Recipe = require(id)(RecipeModel);
-        return new Recipe(loadRecipeConfig(id));
+        let Recipe;
+        try {
+          // eslint-disable-next-line
+          Recipe = require(id)(RecipeModel);
+          return new Recipe(loadRecipeConfig(id));
+        } catch (err) {
+          console.error(err);
+        }
+
+        return false;
       }).filter(recipe => recipe.id).map((data) => {
         const recipe = data;
 
@@ -579,7 +586,7 @@ export default class ServerApi {
 
       return recipes;
     } catch (err) {
-      console.debug('Folder `recipe/dev` does not exist');
+      console.debug('Could not load dev recipes');
       return false;
     }
   }
diff --git a/src/app.js b/src/app.js
index b539ea494..a0b88611c 100644
--- a/src/app.js
+++ b/src/app.js
@@ -101,3 +101,7 @@ window.addEventListener('load', () => {
   };
   window.franz.render();
 });
+
+// Prevent drag and drop into window from redirecting
+window.addEventListener('dragover', event => event.preventDefault());
+window.addEventListener('drop', event => event.preventDefault());
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index fac0f6b9a..9b359a78e 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -69,10 +69,6 @@ const messages = defineMessages({
 export default class EditServiceForm extends Component {
   static propTypes = {
     recipe: PropTypes.instanceOf(Recipe).isRequired,
-    // service: PropTypes.oneOfType([
-    //   PropTypes.object,
-    //   PropTypes.instanceOf(Service),
-    // ]),
     service(props, propName) {
       if (props.action === 'edit' && !(props[propName] instanceof Service)) {
         return new Error(`'${propName}'' is expected to be of type 'Service'
@@ -207,7 +203,7 @@ export default class EditServiceForm extends Component {
                 )}
                 {recipe.hasCustomUrl && (
                   <TabItem title={intl.formatMessage(messages.tabOnPremise)}>
-                    {user.isPremium ? (
+                    {user.isPremium || recipe.author.find(a => a.email === user.email) ? (
                       <div>
                         <Input field={form.$('customUrl')} />
                         {form.error === 'url-validation-error' && (
diff --git a/src/environment.js b/src/environment.js
index 7bb2db134..e185120c0 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -8,16 +8,7 @@ export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 
-let ctrlShortcutKey;
-if (isMac) {
-  ctrlShortcutKey = '⌘';
-} else if (isWindows) {
-  ctrlShortcutKey = 'Ctrl';
-} else {
-  ctrlShortcutKey = 'Alt';
-}
-
-export const ctrlKey = ctrlShortcutKey;
+export const ctrlKey = isMac ? '⌘' : 'Ctrl';
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/index.js b/src/index.js
index 030736fee..f0fe56ae5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,18 +2,14 @@ import { app, BrowserWindow, shell } from 'electron';
 import fs from 'fs-extra';
 import path from 'path';
 
-/* eslint-disable */
-if (require('electron-squirrel-startup')) app.quit();
-
 import windowStateKeeper from 'electron-window-state';
 
 import { isDevMode, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
-import { appId } from './package.json';
+import { appId } from './package.json'; // eslint-disable-line import/no-unresolved
 import './electron/exception';
-/* eslint-enable */
 
 // Keep a global reference of the window object, if you don't, the window will

 // be closed automatically when the JavaScript object is garbage collected.

@@ -22,6 +18,7 @@ let willQuitApp = false;
 
 // Ensure that the recipe directory exists
 fs.ensureDir(path.join(app.getPath('userData'), 'recipes'));
+fs.emptyDirSync(path.join(app.getPath('userData'), 'recipes', 'temp'));
 
 // Set App ID for Windows
 if (isWindows) {
@@ -29,19 +26,18 @@ if (isWindows) {
 }
 
 // Force single window
-if (process.platform !== 'darwin') {
-  const isSecondInstance = app.makeSingleInstance(() => {
-    if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
-      mainWindow.focus();
-    }
-  });
-
-  if (isSecondInstance) {
-    app.quit();
+const isSecondInstance = app.makeSingleInstance(() => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.focus();
   }
+});
+
+if (isSecondInstance) {
+  app.exit();
 }
 
+
 // Initialize Settings
 const settings = new Settings();
 
@@ -89,9 +85,13 @@ const createWindow = async () => {
     // when you should delete the corresponding element.

     if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
       e.preventDefault();
-      mainWindow.hide();
+      if (isWindows) {
+        mainWindow.minimize();
+      } else {
+        mainWindow.hide();
+      }
 
-      if (process.platform === 'win32') {
+      if (isWindows && settings.get('minimizeToSystemTray')) {
         mainWindow.setSkipTaskbar(true);
       }
     } else {
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 6bbf302ca..8f0a92c3d 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,7 +1,7 @@
 import { remote, shell } from 'electron';
 import { autorun, computed, observable, toJS } from 'mobx';
 
-import { isMac, isLinux } from '../environment';
+import { isMac } from '../environment';
 
 const { app, Menu, dialog } = remote;
 
@@ -276,10 +276,9 @@ export default class FranzMenu {
     const services = this.stores.services.enabled;
 
     if (this.stores.user.isLoggedIn) {
-      const systemAcceleratorKey = isLinux ? 'Alt' : 'CmdOrCtrl';
       return services.map((service, i) => ({
         label: service.name,
-        accelerator: i <= 9 ? `${systemAcceleratorKey}+${i + 1}` : null,
+        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 43a3450b1..9971df77c 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,7 +1,8 @@
+import emailParser from 'address-rfc2822';
+
 export default class Recipe {
   id = '';
   name = '';
-  author = '';
   description = '';
   version = '1.0';
   path = '';
@@ -25,12 +26,13 @@ export default class Recipe {
     }
 
     if (!data.id) {
-      throw Error('Recipe requires Id');
+      // Franz 4 recipes do not have an Id
+      throw Error(`Recipe '${data.name}' requires Id`);
     }
 
     this.id = data.id || this.id;
     this.name = data.name || this.name;
-    this.author = data.author || this.author;
+    this.rawAuthor = data.author || this.author;
     this.description = data.description || this.description;
     this.version = data.version || this.version;
     this.path = data.path;
@@ -49,4 +51,15 @@ export default class Recipe {
 
     this.message = data.config.message || this.message;
   }
+
+  get author() {
+    try {
+      const addresses = emailParser.parse(this.rawAuthor);
+      return addresses.map(a => ({ email: a.address, name: a.phrase }));
+    } catch (err) {
+      console.warn(`Not a valid author for ${this.name}`);
+    }
+
+    return [];
+  }
 }
diff --git a/src/models/Service.js b/src/models/Service.js
index 89d6748b5..c7276821a 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -58,7 +58,12 @@ export default class Service {
 
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
-      let url = normalizeUrl(this.customUrl);
+      let url;
+      try {
+        url = normalizeUrl(this.customUrl);
+      } catch (err) {
+        console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
+      }
 
       if (typeof this.recipe.buildUrl === 'function') {
         url = this.recipe.buildUrl(url);
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index f608a689e..ecfd621d3 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -2,19 +2,23 @@ import { remote, ipcRenderer, shell } from 'electron';
 import { action, observable } from 'mobx';
 import moment from 'moment';
 import key from 'keymaster';
-import path from 'path';
+// import path from 'path';
 import idleTimer from '@paulcbetts/system-idle-time';
+import AutoLaunch from 'auto-launch';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import { CHECK_INTERVAL } from '../config';
-import { isMac, isLinux } from '../environment';
+import { isMac } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
 const { app, powerMonitor } = remote;
 const defaultLocale = 'en-US';
+const autoLauncher = new AutoLaunch({
+  name: 'Franz',
+});
 
 export default class AppStore extends Store {
   updateStatusTypes = {
@@ -41,7 +45,7 @@ export default class AppStore extends Store {
   miner = null;
   @observable minerHashrate = 0.0;
 
-  constructor(...args: any) {
+  constructor(...args) {
     super(...args);
 
     // Register action handlers
@@ -152,33 +156,24 @@ export default class AppStore extends Store {
       indicator = '•';
     } else if (unreadDirectMessageCount === 0 && unreadIndirectMessageCount === 0) {
       indicator = 0;
+    } else {
+      indicator = parseInt(indicator, 10);
     }
 
     ipcRenderer.send('updateAppIndicator', { indicator });
   }
 
-  @action _launchOnStartup({ enable, openInBackground }) {
+  @action _launchOnStartup({ enable }) {
     this.autoLaunchOnStart = enable;
 
-    let settings = {
-      openAtLogin: enable,
-    };
-
-    // For Windows
-    if (process.platform === 'win32') {
-      settings = Object.assign({
-        openAsHidden: openInBackground,
-        path: app.getPath('exe'),
-        args: [
-          '--processStart', `"${path.basename(app.getPath('exe'))}"`,
-        ],
-      }, settings);
-
-      if (openInBackground) {
-        settings.args.push(
-          '--process-start-args', '"--hidden"',
-        );
+    try {
+      if (enable) {
+        autoLauncher.enable();
+      } else {
+        autoLauncher.disable();
       }
+    } catch (err) {
+      console.warn(err);
     }
 
     gaEvent('App', enable ? 'enable autostart' : 'disable autostart');
@@ -287,31 +282,19 @@ export default class AppStore extends Store {
   }
 
   async _autoStart() {
-    if (!isLinux) {
-      this._checkAutoStart();
+    this.autoLaunchOnStart = await this._checkAutoStart();
 
-      // we need to wait until the settings request is resolved
-      await this.stores.settings.allSettingsRequest;
-
-      // We don't set autostart on first launch for macOS as disabling
-      // the option is currently broken
-      // https://github.com/meetfranz/franz/issues/17
-      // https://github.com/electron/electron/issues/10880
-      if (process.platform === 'darwin') return;
+    // we need to wait until the settings request is resolved
+    await this.stores.settings.allSettingsRequest;
 
-      if (!this.stores.settings.all.appStarts) {
-        this.actions.app.launchOnStartup({
-          enable: true,
-        });
-      }
+    if (!this.stores.settings.all.appStarts) {
+      this.actions.app.launchOnStartup({
+        enable: true,
+      });
     }
   }
 
-  _checkAutoStart() {
-    const loginItem = app.getLoginItemSettings({
-      path: app.getPath('exe'),
-    });
-
-    this.autoLaunchOnStart = loginItem.openAtLogin;
+  async _checkAutoStart() {
+    return autoLauncher.isEnabled() || false;
   }
 }
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index b3397148d..4055b10de 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -1,47 +1,46 @@
 const { ipcRenderer } = require('electron');
 const uuidV1 = require('uuid/v1');
-// const FranzNotificationStore = [];
 
 class Notification {
+  static permission = 'granted';
+
   constructor(title = '', options = {}) {
     this.title = title;
     this.options = options;
     this.notificationId = uuidV1();
-    this.onclick = () => { };
 
-    ipcRenderer.sendToHost('notification', Notification.onNotify({
+    ipcRenderer.sendToHost('notification', this.onNotify({
       notificationId: this.notificationId,
       title,
       options,
     }));
 
-    ipcRenderer.on(`notification-onclick:${this.notificationId}`, () => {
+    ipcRenderer.once(`notification-onclick:${this.notificationId}`, () => {
       this.onclick();
     });
   }
-}
 
-Notification.permission = 'granted';
+  static requestPermission(cb = null) {
+    if (!cb) {
+      return new Promise((resolve) => {
+        resolve(Notification.permission);
+      });
+    }
 
-Notification.requestPermission = (cb = null) => {
-  console.log(this);
-  if (!cb) {
-    return new Promise((resolve) => {
-      resolve(Notification.permission);
-    });
-  }
+    if (typeof (cb) === 'function') {
+      return cb(Notification.permission);
+    }
 
-  if (typeof (cb) === 'function') {
-    return cb(Notification.permission);
+    return Notification.permission;
   }
 
-  return Notification.permission;
-};
+  onNotify(data) {
+    return data;
+  }
 
-Notification.close = () => {
-  // no implementation yet
-};
+  onClick() {}
 
-Notification.onNotify = data => data;
+  close() {}
+}
 
 window.Notification = Notification;