Merge branch 'develop' into feature/features-api

8 files changed, 214 insertions, 83 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 162422017..9ad4cd531 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,7 +15,11 @@ import { gaEvent } from '../lib/analytics';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const { app } = remote;
+const debug = require('debug')('Franz:AppStore');
+
+const { app, systemPreferences } = remote;
+
+const mainWindow = remote.getCurrentWindow();
 
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
@@ -46,8 +50,12 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -80,6 +88,10 @@ export default class AppStore extends Store {
     window.addEventListener('online', () => { this.isOnline = true; });
     window.addEventListener('offline', () => { this.isOnline = false; });
 
+    mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+    mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
+
+
     this.isOnline = navigator.onLine;
 
     // Check if Franz should launch on start
@@ -98,6 +110,10 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
+
+        if (isMac) {
+          app.dock.bounce();
+        }
       }
 
       if (data.available !== undefined && !data.available) {
@@ -124,19 +140,6 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    // Reload all services after a healthy nap
-    // Alternative solution for powerMonitor as the resume event is not fired
-    // More information: https://github.com/electron/electron/issues/1615
-    const TIMEOUT = 5000;
-    let lastTime = (new Date()).getTime();
-    setInterval(() => {
-      const currentTime = (new Date()).getTime();
-      if (currentTime > (lastTime + TIMEOUT + 2000)) {
-        this._reactivateServices();
-      }
-      lastTime = currentTime;
-    }, TIMEOUT);
-
     // Set active the next service
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
@@ -158,6 +161,8 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
   }
 
   @computed get cacheSize() {
@@ -166,7 +171,7 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
-    if (this.stores.settings.all.isAppMuted) return;
+    if (this.stores.settings.all.app.isAppMuted) return;
 
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
@@ -179,8 +184,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
@@ -244,17 +247,18 @@ export default class AppStore extends Store {
   }
 
   @action _muteApp({ isMuted, overrideSystemMute = true }) {
-    this.isSystemMuteOverriden = overrideSystemMute;
+    this.isSystemMuteOverridden = overrideSystemMute;
 
     this.actions.settings.update({
-      settings: {
+      type: 'app',
+      data: {
         isAppMuted: isMuted,
       },
     });
   }
 
   @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.app.isAppMuted });
   }
 
   @action async _clearAllCache() {
@@ -288,13 +292,19 @@ export default class AppStore extends Store {
   }
 
   _setLocale() {
-    const locale = this.stores.settings.all.locale;
+    let locale;
+    if (this.stores.user.isLoggedIn) {
+      locale = this.stores.user.data.locale;
+    }
+
 
     if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
     } else if (!locale) {
       this.locale = this._getDefaultLocale();
     }
+
+    debug(`Set locale to "${this.locale}"`);
   }
 
   _getDefaultLocale() {
@@ -336,8 +346,9 @@ export default class AppStore extends Store {
   // Helpers
   _appStartsCounter() {
     this.actions.settings.update({
-      settings: {
-        appStarts: (this.stores.settings.all.appStarts || 0) + 1,
+      type: 'stats',
+      data: {
+        appStarts: (this.stores.settings.all.stats.appStarts || 0) + 1,
       },
     });
   }
@@ -345,7 +356,8 @@ export default class AppStore extends Store {
   async _autoStart() {
     this.autoLaunchOnStart = await this._checkAutoStart();
 
-    if (this.stores.settings.all.appStarts === 1) {
+    if (this.stores.settings.all.stats.appStarts === 1) {
+      debug('Set app to launch on start');
       this.actions.app.launchOnStartup({
         enable: true,
       });
@@ -356,19 +368,9 @@ export default class AppStore extends Store {
     return autoLauncher.isEnabled() || false;
   }
 
-  _reactivateServices(retryCount = 0) {
-    if (!this.isOnline) {
-      console.debug('reactivateServices: computer is offline, trying again in 5s, retries:', retryCount);
-      setTimeout(() => this._reactivateServices(retryCount + 1), 5000);
-    } else {
-      console.debug('reactivateServices: reload Franz');
-      window.location.reload();
-    }
-  }
-
   _systemDND() {
     const dnd = getDoNotDisturb();
-    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
       this.actions.app.muteApp({
         isMuted: dnd,
         overrideSystemMute: false,
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index a315d3b46..f788c347d 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -4,7 +4,7 @@ import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 
 export default class FeaturesStore extends Store {
-  @observable baseFeaturesRequest = new CachedRequest(this.api.features, 'base');
+  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
   setup() {
@@ -19,7 +19,7 @@ export default class FeaturesStore extends Store {
       return this.featuresRequest.execute().result || {};
     }
 
-    return this.baseFeaturesRequest.execute().result || {};
+    return this.defaultFeaturesRequest.execute().result || {};
   }
 
   _debugFeatures() {
@@ -30,7 +30,7 @@ export default class FeaturesStore extends Store {
     if (this.stores.user.isLoggedIn) {
       this.featuresRequest.invalidate({ immediately: true });
     } else {
-      this.baseFeaturesRequest.invalidate({ immediately: true });
+      this.defaultFeaturesRequest.invalidate({ immediately: true });
     }
   }
 }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 67fee1d50..f2480bc8e 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,6 +5,8 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
+const debug = require('debug')('Franz:RecipeStore');
+
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
@@ -34,7 +36,7 @@ export default class RecipesStore extends Store {
         return activeRecipe;
       }
 
-      console.warn('Recipe not installed');
+      debug(`Recipe ${match.id} not installed`);
     }
 
     return null;
@@ -54,10 +56,8 @@ export default class RecipesStore extends Store {
 
   // Actions
   @action async _install({ recipeId }) {
-    // console.log(this.installRecipeRequest._promise);
     const recipe = await this.installRecipeRequest.execute(recipeId)._promise;
     await this.allRecipesRequest.invalidate({ immediately: true })._promise;
-    // console.log(this.installRecipeRequest._promise);
 
     return recipe;
   }
@@ -67,7 +67,7 @@ export default class RecipesStore extends Store {
     const recipes = {};
 
     // Hackfix, reference this.all to fetch services
-    console.debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
+    debug(`Check Recipe updates for ${this.all.map(recipe => recipe.id)}`);
 
     recipeIds.forEach((r) => {
       const recipe = this.one(r);
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 4140ca362..bbfe6f6df 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,6 +2,8 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
+const debug = require('debug')('Franz:RequestsStore');
+
 export default class RequestStore extends Store {
   @observable userInfoRequest;
   @observable servicesRequest;
@@ -52,7 +54,7 @@ export default class RequestStore extends Store {
         }
 
         this._autoRetry();
-        console.debug(`Retry required requests delayed in ${(delay) / 1000}s`);
+        debug(`Retry required requests delayed in ${(delay) / 1000}s`);
       }, delay);
     }
   }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index c38d0d9ee..cdb2db142 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,8 +1,5 @@
-// import { remote } from 'electron';
-import { action, computed, observable } from 'mobx';
+import { action, reaction, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
-// import path from 'path';
-// import fs from 'fs-extra';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
@@ -10,6 +7,8 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
+const debug = require('debug')('Franz:ServiceStore');
+
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
   @observable createServiceRequest = new Request(this.api.services, 'create');
@@ -61,13 +60,20 @@ export default class ServicesStore extends Store {
       this._mapActiveServiceToServiceModelReaction.bind(this),
       this._saveActiveService.bind(this),
       this._logoutReaction.bind(this),
-      this._shareSettingsWithServiceProcess.bind(this),
     ]);
 
     // Just bind this
     this._initializeServiceRecipeInWebview.bind(this);
   }
 
+  setup() {
+    // Single key reactions
+    reaction(
+      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+  }
+
   @computed get all() {
     if (this.stores.user.isLoggedIn) {
       const services = this.allServicesRequest.execute().result;
@@ -84,7 +90,13 @@ export default class ServicesStore extends Store {
   }
 
   @computed get allDisplayed() {
-    return this.stores.settings.all.showDisabledServices ? this.all : this.enabled;
+    return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
+  }
+
+  // This is just used to avoid unnecessary rerendering of resource-heavy webviews
+  @computed get allDisplayedUnordered() {
+    const services = this.allServicesRequest.execute().result || [];
+    return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
   }
 
   @computed get filtered() {
@@ -103,7 +115,7 @@ export default class ServicesStore extends Store {
         return activeService;
       }
 
-      console.warn('Service not available');
+      debug('Service not available');
     }
 
     return null;
@@ -117,10 +129,10 @@ export default class ServicesStore extends Store {
     const recipesStore = this.stores.recipes;
 
     if (recipesStore.isInstalled(recipeId)) {
-      console.debug('Recipe is installed');
+      debug(`Recipe ${recipeId} is installed`);
       this._redirectToAddServiceRoute(recipeId);
     } else {
-      console.warn('Recipe is not installed');
+      debug(`Recipe ${recipeId} is not installed`);
       // We access the RecipeStore action directly
       // returns Promise instead of action
       await this.stores.recipes._install({ recipeId });
@@ -202,6 +214,14 @@ export default class ServicesStore extends Store {
     await request._promise;
     this.actionStatus = request.result.status;
 
+    if (service.isEnabled) {
+      this._sendIPCMessage({
+        serviceId,
+        channel: 'service-settings-update',
+        args: newData,
+      });
+    }
+
     if (redirect) {
       this.stores.router.push('/settings/services');
       gaEvent('Service', 'update', service.recipe.id);
@@ -326,7 +346,7 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
         });
@@ -426,7 +446,7 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorder({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.showDisabledServices;
+    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
@@ -487,7 +507,7 @@ export default class ServicesStore extends Store {
     if (service) {
       service.webview.openDevTools();
     } else {
-      console.warn('No service is active');
+      debug('No service is active');
     }
   }
 
@@ -504,7 +524,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       this.actions.settings.update({
-        settings: {
+        type: 'service',
+        data: {
           activeService: service.id,
         },
       });
@@ -512,7 +533,7 @@ export default class ServicesStore extends Store {
   }
 
   _mapActiveServiceToServiceModelReaction() {
-    const { activeService } = this.stores.settings.all;
+    const { activeService } = this.stores.settings.all.service;
     if (this.allDisplayed.length) {
       this.allDisplayed.map(service => Object.assign(service, {
         isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id,
@@ -521,7 +542,7 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
     const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
 
     const unreadDirectMessageCount = this.allDisplayed
@@ -545,7 +566,10 @@ export default class ServicesStore extends Store {
 
   _logoutReaction() {
     if (!this.stores.user.isLoggedIn) {
-      this.actions.settings.remove({ key: 'activeService' });
+      this.actions.settings.remove({
+        type: 'service',
+        key: 'activeService',
+      });
       this.allServicesRequest.invalidate().reset();
     }
   }
@@ -553,7 +577,7 @@ export default class ServicesStore extends Store {
   _shareSettingsWithServiceProcess() {
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
-      args: this.stores.settings.all,
+      args: this.stores.settings.all.app,
     });
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b7d803398..f1b067115 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,19 @@
-import { ipcRenderer } from 'electron';
-import { action, computed } from 'mobx';
+import { remote } from 'electron';
+import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import { gaEvent } from '../lib/analytics';
 import SettingsModel from '../models/Settings';
+import Request from './lib/Request';
+import CachedRequest from './lib/CachedRequest';
+
+const { systemPreferences } = remote;
+const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
+  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
+  @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+
   constructor(...args) {
     super(...args);
 
@@ -15,36 +22,110 @@ export default class SettingsStore extends Store {
     this.actions.settings.remove.listen(this._remove.bind(this));
   }
 
-  setup() {
-    this._shareSettingsWithMainProcess();
+  async setup() {
+    // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
+    await this.appSettingsRequest._promise;
+    await this._migrate();
   }
 
   @computed get all() {
-    return new SettingsModel(localStorage.getItem('app') || {});
+    return new SettingsModel({
+      app: this.appSettingsRequest.execute().result || {},
+      service: localStorage.getItem('service') || {},
+      group: localStorage.getItem('group') || {},
+      stats: localStorage.getItem('stats') || {},
+      migration: localStorage.getItem('migration') || {},
+    });
   }
 
-  @action async _update({ settings }) {
+  @action async _update({ type, data }) {
     const appSettings = this.all;
-    localStorage.setItem('app', Object.assign(appSettings, settings));
-
-    // We need a little hack to wait until everything is patched
-    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
+    if (type !== 'app') {
+      debug('Update settings', type, data, this.all);
+      localStorage.setItem(type, Object.assign(appSettings[type], data));
+    } else {
+      debug('Update settings on file system', type, data);
+      this.updateAppSettingsRequest.execute(data);
 
-    gaEvent('Settings', 'update');
+      this.appSettingsRequest.patch((result) => {
+        if (!result) return;
+        Object.assign(result, data);
+      });
+    }
   }
 
-  @action async _remove({ key }) {
-    const appSettings = this.all;
+  @action async _remove({ type, key }) {
+    if (type === 'app') return; // app keys can't be deleted
+
+    const appSettings = this.all[type];
     if (Object.hasOwnProperty.call(appSettings, key)) {
       delete appSettings[key];
-      localStorage.setItem('app', appSettings);
-    }
 
-    this._shareSettingsWithMainProcess();
+      this.actions.settings.update({
+        type,
+        data: appSettings,
+      });
+    }
   }
 
-  // Reactions
-  _shareSettingsWithMainProcess() {
-    ipcRenderer.send('settings', this.all);
+  // Helper
+  async _migrate() {
+    const legacySettings = localStorage.getItem('app') || {};
+
+    if (!this.all.migration['5.0.0-beta.17-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          autoLaunchInBackground: legacySettings.autoLaunchInBackground,
+          runInBackground: legacySettings.runInBackground,
+          enableSystemTray: legacySettings.enableSystemTray,
+          minimizeToSystemTray: legacySettings.minimizeToSystemTray,
+          isAppMuted: legacySettings.isAppMuted,
+          enableGPUAcceleration: legacySettings.enableGPUAcceleration,
+          showMessageBadgeWhenMuted: legacySettings.showMessageBadgeWhenMuted,
+          showDisabledServices: legacySettings.showDisabledServices,
+          enableSpellchecking: legacySettings.enableSpellchecking,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'service',
+        data: {
+          activeService: legacySettings.activeService,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.17-settings': true,
+        },
+      });
+
+      localStorage.removeItem('app');
+
+      debug('Migrated settings to split stores');
+    }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+
+      localStorage.removeItem('app');
+
+      debug('Set up dark mode');
+    }
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 5e9cc9ba7..bee6c8bcf 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -17,7 +17,7 @@ export default class UIStore extends Store {
   @computed get showMessageBadgesEvenWhenMuted() {
     const settings = this.stores.settings.all;
 
-    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
   // Actions
@@ -26,7 +26,7 @@ export default class UIStore extends Store {
     this.stores.router.push(settingsPath);
   }
 
-  @action _closeSettings(): void {
+  @action _closeSettings() {
     this.stores.router.push('/');
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7dbbd955b..9d8ac5657 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,6 +9,8 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 
+const debug = require('debug')('Franz:UserStore');
+
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
   BASE_ROUTE = '/auth';
@@ -69,6 +71,11 @@ export default class UserStore extends Store {
     ]);
   }
 
+  setup() {
+    // Data migration
+    this._migrateUserLocale();
+  }
+
   // Routes
   get loginRoute() {
     return this.LOGIN_ROUTE;
@@ -256,8 +263,10 @@ export default class UserStore extends Store {
 
       // We need to set the beta flag for the SettingsStore
       this.actions.settings.update({
-        settings: {
+        type: 'app',
+        data: {
           beta: data.beta,
+          locale: data.locale,
         },
       });
     }
@@ -292,4 +301,17 @@ export default class UserStore extends Store {
       this.id = null;
     }
   }
+
+  async _migrateUserLocale() {
+    await this.getUserInfoRequest._promise;
+
+    if (!this.data.locale) {
+      debug('Migrate "locale" to user data');
+      this.actions.user.update({
+        userData: {
+          locale: this.stores.app.locale,
+        },
+      });
+    }
+  }
 }