Merge branch 'release/5.0.0-beta.19'

10 files changed, 276 insertions, 59 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 38edff1b4..6f156a96d 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -12,12 +12,14 @@ import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
+import { onVisibilityChange } from '../helpers/visibility-helper';
+import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
-const debug = require('debug')('AppStore');
+const debug = require('debug')('Franz:AppStore');
 
-const { app } = remote;
+const { app, systemPreferences } = remote;
 
 const mainWindow = remote.getCurrentWindow();
 
@@ -50,10 +52,16 @@ export default class AppStore extends Store {
 
   @observable isSystemMuteOverridden = false;
 
+  @observable isSystemDarkModeEnabled = false;
+
   @observable isClearingAllCache = false;
 
   @observable isFullScreen = mainWindow.isFullScreen();
 
+  @observable isFocused = true;
+
+  dictionaries = [];
+
   constructor(...args) {
     super(...args);
 
@@ -77,7 +85,7 @@ export default class AppStore extends Store {
     ]);
   }
 
-  setup() {
+  async setup() {
     this._appStartsCounter();
     // Focus the active service
     window.addEventListener('focus', this.actions.service.focusActiveService);
@@ -159,6 +167,14 @@ export default class AppStore extends Store {
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
+
+    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
+
+    onVisibilityChange((isVisible) => {
+      this.isFocused = isVisible;
+
+      debug('Window is visible/focused', isVisible);
+    });
   }
 
   @computed get cacheSize() {
@@ -304,31 +320,12 @@ export default class AppStore extends Store {
   }
 
   _getDefaultLocale() {
-    let locale = app.getLocale();
-    if (locales[locale] === undefined) {
-      let localeFuzzy;
-      Object.keys(locales).forEach((localStr) => {
-        if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-          if (locale.substring(0, 2) === localStr.substring(0, 2)) {
-            localeFuzzy = localStr;
-          }
-        }
-      });
-
-      if (localeFuzzy !== undefined) {
-        locale = localeFuzzy;
-      }
-    }
-
-    if (locales[locale] === undefined) {
-      locale = defaultLocale;
-    }
-
-    if (!locale) {
-      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
-    }
-
-    return locale;
+    return getLocale({
+      locale: app.getLocale(),
+      locales,
+      defaultLocale,
+      fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
+    });
   }
 
   _muteAppHandler() {
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
new file mode 100644
index 000000000..b9c5f2abf
--- /dev/null
+++ b/src/stores/DictionaryStore.js
@@ -0,0 +1,45 @@
+import { observable } from 'mobx';
+import { createDownloader } from 'hunspell-dict-downloader';
+
+import Store from './lib/Store';
+
+import { DICTIONARY_PATH } from '../config';
+
+const debug = require('debug')('Franz:DictionaryStore');
+
+export default class DictionaryStore extends Store {
+  @observable available = []
+  @observable installed = []
+
+  _dictDownloader = null
+
+  constructor(...args) {
+    super(...args);
+
+    this.registerReactions([
+      this._downloadDictForUserLocale.bind(this),
+    ]);
+  }
+
+  async setup() {
+    this._dictDownloader = await createDownloader(DICTIONARY_PATH);
+    debug('dicts', this._dictDownloader);
+
+    this.available = this._dictDownloader.availableDictionaries;
+    this.installed = this._dictDownloader.installedDictionaries;
+
+    if (!this.installed.includes('en-us')) {
+      this._dictDownloader.installDictionary('en-us');
+    }
+  }
+
+  _downloadDictForUserLocale() {
+    const spellcheckerLanguage = this.stores.settings.app.spellcheckerLanguage;
+
+    debug('trying to Downloading dict for', spellcheckerLanguage);
+    if (!this.installed.includes(spellcheckerLanguage) && this.available.includes(spellcheckerLanguage) && spellcheckerLanguage !== 'en-us') {
+      debug('Downloading dict for', spellcheckerLanguage);
+      this._dictDownloader.installDictionary(spellcheckerLanguage);
+    }
+  }
+}
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
new file mode 100644
index 000000000..10c893d3f
--- /dev/null
+++ b/src/stores/FeaturesStore.js
@@ -0,0 +1,50 @@
+import { computed, observable } from 'mobx';
+
+import Store from './lib/Store';
+import CachedRequest from './lib/CachedRequest';
+
+import delayApp from '../features/delayApp';
+import spellchecker from '../features/spellchecker';
+import serviceProxy from '../features/serviceProxy';
+
+import { DEFAULT_FEATURES_CONFIG } from '../config';
+
+export default class FeaturesStore extends Store {
+  @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
+  @observable featuresRequest = new CachedRequest(this.api.features, 'features');
+
+  async setup() {
+    this.registerReactions([
+      this._monitorLoginStatus.bind(this),
+    ]);
+
+    await this.featuresRequest._promise;
+    setTimeout(this._enableFeatures.bind(this), 1);
+  }
+
+  @computed get anonymousFeatures() {
+    return this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+  }
+
+  @computed get features() {
+    if (this.stores.user.isLoggedIn) {
+      return this.featuresRequest.execute().result || DEFAULT_FEATURES_CONFIG;
+    }
+
+    return DEFAULT_FEATURES_CONFIG;
+  }
+
+  _monitorLoginStatus() {
+    if (this.stores.user.isLoggedIn) {
+      this.featuresRequest.invalidate({ immediately: true });
+    } else {
+      this.defaultFeaturesRequest.invalidate({ immediately: true });
+    }
+  }
+
+  _enableFeatures() {
+    delayApp(this.stores, this.actions);
+    spellchecker(this.stores, this.actions);
+    serviceProxy(this.stores, this.actions);
+  }
+}
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index a24308f6a..f2480bc8e 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -5,7 +5,7 @@ import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
 
-const debug = require('debug')('RecipeStore');
+const debug = require('debug')('Franz:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 595852583..bbfe6f6df 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -2,7 +2,7 @@ import { action, computed, observable } from 'mobx';
 
 import Store from './lib/Store';
 
-const debug = require('debug')('RequestsStore');
+const debug = require('debug')('Franz:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index ccb85421a..99b091589 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -7,7 +7,7 @@ import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('ServiceStore');
+const debug = require('debug')('Franz:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
@@ -67,9 +67,14 @@ export default class ServicesStore extends Store {
   }
 
   setup() {
-    // Single key reactions
+    // Single key reactions for the sake of your CPU
     reaction(
-      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this.stores.settings.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+
+    reaction(
+      () => this.stores.settings.app.spellcheckerLanguage,
       () => this._shareSettingsWithServiceProcess(),
     );
   }
@@ -93,7 +98,7 @@ export default class ServicesStore extends Store {
     return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled;
   }
 
-  // This is just used to avoid unnecessary rerendering of resource-heavy webviews 
+  // 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);
@@ -143,6 +148,7 @@ export default class ServicesStore extends Store {
   // Actions
   @action async _createService({ recipeId, serviceData, redirect = true }) {
     const data = this._cleanUpTeamIdAndCustomUrl(recipeId, serviceData);
+
     const response = await this.createServiceRequest.execute(recipeId, data)._promise;
 
     this.allServicesRequest.patch((result) => {
@@ -150,6 +156,13 @@ export default class ServicesStore extends Store {
       result.push(response.data);
     });
 
+    this.actions.settings.update({
+      type: 'proxy',
+      data: {
+        [`${response.data.id}`]: data.proxy,
+      },
+    });
+
     this.actionStatus = response.status || [];
 
     if (redirect) {
@@ -214,6 +227,21 @@ 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,
+      });
+    }
+
+    this.actions.settings.update({
+      type: 'proxy',
+      data: {
+        [`${serviceId}`]: data.proxy,
+      },
+    });
+
     if (redirect) {
       this.stores.router.push('/settings/services');
       gaEvent('Service', 'update', service.recipe.id);
@@ -411,6 +439,8 @@ export default class ServicesStore extends Store {
 
   @action _reload({ serviceId }) {
     const service = this.one(serviceId);
+    if (!service.isEnabled) return;
+
     service.resetMessageCount();
 
     service.webview.loadURL(service.url);
@@ -567,9 +597,10 @@ export default class ServicesStore extends Store {
   }
 
   _shareSettingsWithServiceProcess() {
+    const settings = this.stores.settings.app;
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
-      args: this.stores.settings.all.app,
+      args: settings,
     });
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index d8519c609..9ea14a911 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,54 +1,105 @@
+import { remote, ipcRenderer } from 'electron';
 import { action, computed, observable } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
-import SettingsModel from '../models/Settings';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import { getLocale } from '../helpers/i18n-helpers';
 
-const debug = require('debug')('SettingsStore');
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+
+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');
 
+  @observable fileSystemSettingsRequests = [];
+
+  fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
+  @observable _fileSystemSettingsCache = {
+    app: DEFAULT_APP_SETTINGS,
+    proxy: {},
+  };
+
   constructor(...args) {
     super(...args);
 
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      this.fileSystemSettingsRequests[type] = new CachedRequest(this.api.local, 'getAppSettings');
+    });
+
+    ipcRenderer.on('appSettings', (event, resp) => {
+      debug('Get appSettings resolves', resp, resp.type, resp.data);
+
+      this._fileSystemSettingsCache[resp.type] = resp.data;
+    });
+
+    this.fileSystemSettingsTypes.forEach((type) => {
+      ipcRenderer.send('getAppSettings', type);
+    });
   }
 
   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();
+    await this._migrate();
+  }
+
+  @computed get app() {
+    return this._fileSystemSettingsCache.app || DEFAULT_APP_SETTINGS;
+  }
+
+  @computed get proxy() {
+    return this._fileSystemSettingsCache.proxy || {};
+  }
+
+  @computed get service() {
+    return localStorage.getItem('service') || {
+      activeService: '',
+    };
+  }
+
+  @computed get stats() {
+    return localStorage.getItem('stats') || {
+      activeService: '',
+    };
+  }
+
+  @computed get migration() {
+    return localStorage.getItem('migration') || {};
   }
 
   @computed get all() {
-    return new SettingsModel({
-      app: this.appSettingsRequest.execute().result || {},
-      service: localStorage.getItem('service') || {},
-      group: localStorage.getItem('group') || {},
-      stats: localStorage.getItem('stats') || {},
-      migration: localStorage.getItem('migration') || {},
-    });
+    return {
+      app: this.app,
+      proxy: this.proxy,
+      service: this.service,
+      stats: this.stats,
+      migration: this.migration,
+    };
   }
 
   @action async _update({ type, data }) {
     const appSettings = this.all;
-    if (type !== 'app') {
+    if (!this.fileSystemSettingsTypes.includes(type)) {
       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);
-
-      this.appSettingsRequest.patch((result) => {
-        if (!result) return;
-        Object.assign(result, data);
+      ipcRenderer.send('updateAppSettings', {
+        type,
+        data,
       });
+
+      Object.assign(this._fileSystemSettingsCache[type], data);
     }
   }
 
@@ -67,8 +118,8 @@ export default class SettingsStore extends Store {
   }
 
   // Helper
-  _migrate() {
-    const legacySettings = localStorage.getItem('app');
+  async _migrate() {
+    const legacySettings = localStorage.getItem('app') || {};
 
     if (!this.all.migration['5.0.0-beta.17-settings']) {
       this.actions.settings.update({
@@ -104,5 +155,34 @@ export default class SettingsStore extends Store {
 
       debug('Migrated settings to split stores');
     }
+
+    // Enable dark mode once
+    if (!this.all.migration['5.0.0-beta.19-settings']) {
+      const spellcheckerLanguage = getLocale({
+        locale: this.stores.settings.app.locale,
+        locales: SPELLCHECKER_LOCALES,
+        defaultLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+        fallbackLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+      });
+
+      this.actions.settings.update({
+        type: 'app',
+        data: {
+          darkMode: systemPreferences.isDarkMode(),
+          spellcheckerLanguage,
+        },
+      });
+
+      this.actions.settings.update({
+        type: 'migration',
+        data: {
+          '5.0.0-beta.19-settings': true,
+        },
+      });
+    }
+  }
+
+  _getFileBasedSettings(type) {
+    ipcRenderer.send('getAppSettings', type);
   }
 }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index b391bdcae..d37ebe4c7 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,6 +1,8 @@
 import { action, observable, computed } from 'mobx';
 
 import Store from './lib/Store';
+import * as themeDefault from '../theme/default';
+import * as themeDark from '../theme/dark';
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
@@ -20,13 +22,21 @@ export default class UIStore extends Store {
     return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.isAppMuted;
   }
 
+  @computed get theme() {
+    if (this.stores.settings.all.app.darkMode) {
+      return Object.assign({}, themeDefault, themeDark);
+    }
+
+    return themeDefault;
+  }
+
   // Actions
   @action _openSettings({ path = '/settings' }) {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
     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 574616925..26ac2c60e 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -9,7 +9,7 @@ import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
 
-const debug = require('debug')('UserStore');
+const debug = require('debug')('Franz:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
@@ -122,13 +122,13 @@ export default class UserStore extends Store {
   }
 
   @computed get data() {
-    this.getUserInfoRequest.execute();
-    return this.getUserInfoRequest.result || {};
+    if (!this.isLoggedIn) return {};
+
+    return this.getUserInfoRequest.execute().result || {};
   }
 
   @computed get legacyServices() {
-    this.getLegacyServicesRequest.execute();
-    return this.getLegacyServicesRequest.result || [];
+    return this.getLegacyServicesRequest.execute() || {};
   }
 
   // Actions
diff --git a/src/stores/index.js b/src/stores/index.js
index 2d99e3952..f547d0a7a 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -1,5 +1,6 @@
 import AppStore from './AppStore';
 import UserStore from './UserStore';
+import FeaturesStore from './FeaturesStore';
 import SettingsStore from './SettingsStore';
 import ServicesStore from './ServicesStore';
 import RecipesStore from './RecipesStore';
@@ -8,6 +9,7 @@ import UIStore from './UIStore';
 import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
+import DictionaryStore from './DictionaryStore';
 import GlobalErrorStore from './GlobalErrorStore';
 
 export default (api, actions, router) => {
@@ -16,6 +18,7 @@ export default (api, actions, router) => {
     router,
     app: new AppStore(stores, api, actions),
     user: new UserStore(stores, api, actions),
+    features: new FeaturesStore(stores, api, actions),
     settings: new SettingsStore(stores, api, actions),
     services: new ServicesStore(stores, api, actions),
     recipes: new RecipesStore(stores, api, actions),
@@ -24,6 +27,7 @@ export default (api, actions, router) => {
     payment: new PaymentStore(stores, api, actions),
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
+    dictionary: new DictionaryStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
   });
   // Initialize all stores