5.0.0 beta.18v5.0.0-beta.18

5 files changed, 151 insertions, 46 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 4ac8325d4..38edff1b4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -15,8 +15,12 @@ import { gaEvent } from '../lib/analytics';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
+const debug = require('debug')('AppStore');
+
 const { app } = remote;
 
+const mainWindow = remote.getCurrentWindow();
+
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
@@ -48,6 +52,8 @@ export default class AppStore extends Store {
 
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -80,6 +86,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
@@ -157,7 +167,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) => {
@@ -170,8 +180,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
@@ -238,14 +246,15 @@ export default class AppStore extends Store {
     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() {
@@ -279,13 +288,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() {
@@ -327,8 +342,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,
       },
     });
   }
@@ -336,7 +352,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,
       });
@@ -349,7 +366,7 @@ export default class AppStore extends Store {
 
   _systemDND() {
     const dnd = getDoNotDisturb();
-    if (dnd !== this.stores.settings.all.isAppMuted && !this.isSystemMuteOverridden) {
+    if (dnd !== this.stores.settings.all.app.isAppMuted && !this.isSystemMuteOverridden) {
       this.actions.app.muteApp({
         isMuted: dnd,
         overrideSystemMute: false,
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index f7d92b1ff..ccb85421a 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';
@@ -63,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;
@@ -86,13 +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.showDisabledServices ? services : services.filter(service => service.isEnabled);
+    return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled);
   }
 
   @computed get filtered() {
@@ -334,7 +338,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,
         });
@@ -434,7 +438,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]);
 
@@ -512,7 +516,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       this.actions.settings.update({
-        settings: {
+        type: 'service',
+        data: {
           activeService: service.id,
         },
       });
@@ -520,7 +525,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,
@@ -529,7 +534,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
@@ -553,7 +558,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();
     }
   }
@@ -561,7 +569,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..d8519c609 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,12 +1,17 @@
-import { ipcRenderer } from 'electron';
-import { action, computed } from 'mobx';
+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 debug = require('debug')('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 +20,89 @@ 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;
+    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));
+    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);
 
-    // We need a little hack to wait until everything is patched
-    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
-
-    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
+  _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');
+    }
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 5e9cc9ba7..b391bdcae 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
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 7dbbd955b..574616925 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')('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,
+        },
+      });
+    }
+  }
 }