4 files changed, 72 insertions, 18 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index a5e0839f2..7dbef985d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -16,10 +16,6 @@ import Miner from '../lib/Miner';
 const { app, getCurrentWindow, powerMonitor } = remote;
 const defaultLocale = 'en-US';
 
-const appFolder = path.dirname(process.execPath);
-const updateExe = path.resolve(appFolder, '..', 'Update.exe');
-const exeName = path.basename(process.execPath);
-
 export default class AppStore extends Store {
   updateStatusTypes = {
     CHECKING: 'CHECKING',
@@ -84,7 +80,7 @@ export default class AppStore extends Store {
     // Check for updates once every 4 hours
     setInterval(() => this._checkForUpdates(), CHECK_INTERVAL);
     // Check for an update in 30s (need a delay to prevent Squirrel Installer lock file issues)
-    setTimeout(() => this._checkForUpdates(), 3000);
+    setTimeout(() => this._checkForUpdates(), 30000);
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
@@ -125,6 +121,18 @@ export default class AppStore extends Store {
       this.actions.service.openDevToolsForActiveService();
     });
 
+    // Set active the next service
+    key(
+      '⌘+pagedown, ctrl+pagedown, ⌘+shift+tab, ctrl+shift+tab', () => {
+        this.actions.service.setActiveNext();
+      });
+
+    // Set active the prev service
+    key(
+      '⌘+pageup, ctrl+pageup, ⌘+tab, ctrl+tab', () => {
+        this.actions.service.setActivePrev();
+      });
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
@@ -161,24 +169,27 @@ export default class AppStore extends Store {
   @action _launchOnStartup({ enable, openInBackground }) {
     this.autoLaunchOnStart = enable;
 
-    const settings = {
+    let settings = {
       openAtLogin: enable,
-      openAsHidden: openInBackground,
-      path: updateExe,
-      args: [
-        '--processStart', `"${exeName}"`,
-      ],
     };
 
     // For Windows
-    if (openInBackground) {
-      settings.args.push(
-        '--process-start-args', '"--hidden"',
-      );
+    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"',
+        );
+      }
     }
 
-    app.setLoginItemSettings(settings);
-
     gaEvent('App', enable ? 'enable autostart' : 'disable autostart');
   }
 
@@ -291,6 +302,12 @@ export default class AppStore extends Store {
       // 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;
+
       if (!this.stores.settings.all.appStarts) {
         this.actions.app.launchOnStartup({
           enable: true,
@@ -301,7 +318,7 @@ export default class AppStore extends Store {
 
   _checkAutoStart() {
     const loginItem = app.getLoginItemSettings({
-      path: updateExe,
+      path: app.getPath('exe'),
     });
 
     this.autoLaunchOnStart = loginItem.openAtLogin;
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index cdc274685..67fee1d50 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -65,6 +65,10 @@ export default class RecipesStore extends Store {
   @action async _update() {
     const recipeIds = this.recipeIdForServices;
     const recipes = {};
+
+    // Hackfix, reference this.all to fetch services
+    console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
+
     recipeIds.forEach((r) => {
       const recipe = this.one(r);
       recipes[r] = recipe.version;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 77d2e7da4..19db05494 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -24,6 +24,8 @@ export default class ServicesStore extends Store {
 
     // Register action handlers
     this.actions.service.setActive.listen(this._setActive.bind(this));
+    this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
+    this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
     this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
     this.actions.service.createService.listen(this._createService.bind(this));
     this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
@@ -206,6 +208,24 @@ export default class ServicesStore extends Store {
     service.isActive = true;
   }
 
+  @action _setActiveNext() {
+    const nextIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), 1, this.enabled.length);
+
+    this.all.forEach((s, index) => {
+      this.all[index].isActive = false;
+    });
+    this.enabled[nextIndex].isActive = true;
+  }
+
+  @action _setActivePrev() {
+    const prevIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), -1, this.enabled.length);
+
+    this.all.forEach((s, index) => {
+      this.all[index].isActive = false;
+    });
+    this.enabled[prevIndex].isActive = true;
+  }
+
   @action _setUnreadMessageCount({ serviceId, count }) {
     const service = this.one(serviceId);
 
@@ -500,4 +520,8 @@ export default class ServicesStore extends Store {
   _reorderAnalytics = debounce(() => {
     gaEvent('Service', 'order');
   }, 5000);
+
+  _wrapIndex(index, delta, size) {
+    return (((index + delta) % size) + size) % size;
+  }
 }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 4927d615f..1cb2ecac3 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -192,6 +192,15 @@ export default class UserStore extends Store {
   @action async _importLegacyServices({ services }) {
     this.isImportLegacyServicesExecuting = true;
 
+    // Reduces recipe duplicates
+    const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
+
+    // Install recipes
+    for (const recipe of recipes) {
+      // eslint-disable-next-line
+      await this.stores.recipes._install({ recipeId: recipe });
+    }
+
     for (const service of services) {
       this.actions.service.createFromLegacyService({
         data: service,