Merge branch 'develop' into publish-debug

7 files changed, 103 insertions, 16 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 0756a05eb..36e6efd4f 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -27,7 +27,7 @@ import { sleep } from '../helpers/async-helpers';
 const debug = require('debug')('Ferdi:AppStore');
 
 const {
-  app, systemPreferences, screen, powerMonitor,
+  app, nativeTheme, screen, powerMonitor,
 } = remote;
 
 const mainWindow = remote.getCurrentWindow();
@@ -185,7 +185,7 @@ export default class AppStore extends Store {
       this._healthCheck();
     }, 1000);
 
-    this.isSystemDarkModeEnabled = systemPreferences.isDarkMode();
+    this.isSystemDarkModeEnabled = nativeTheme.shouldUseDarkColors;
 
     onVisibilityChange((isVisible) => {
       this.isFocused = isVisible;
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index aa9fa4062..8a279bc8a 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -21,7 +21,7 @@ import settingsWS from '../features/settingsWS';
 import serviceLimit from '../features/serviceLimit';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
-import accentColor from '../features/accentColor';
+import appearance from '../features/appearance';
 import planSelection from '../features/planSelection';
 import trialStatusBar from '../features/trialStatusBar';
 
@@ -92,7 +92,7 @@ export default class FeaturesStore extends Store {
     serviceLimit(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
-    accentColor(this.stores, this.actions);
+    appearance(this.stores, this.actions);
     planSelection(this.stores, this.actions);
     trialStatusBar(this.stores, this.actions);
   }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 8b2bde5df..cf5d0a074 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -1,9 +1,13 @@
 import { action, computed, observable } from 'mobx';
+import fs from 'fs-extra';
+import path from 'path';
+import semver from 'semver';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 import Request from './lib/Request';
 import { matchRoute } from '../helpers/routing-helpers';
+import { RECIPES_PATH } from '../config';
 
 const debug = require('debug')('Ferdi:RecipeStore');
 
@@ -83,7 +87,30 @@ export default class RecipesStore extends Store {
 
     if (Object.keys(recipes).length === 0) return;
 
-    const updates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+    const remoteUpdates = await this.getRecipeUpdatesRequest.execute(recipes)._promise;
+
+    // Check for local updates
+    const allJsonFile = path.join(RECIPES_PATH, 'all.json');
+    const allJson = await fs.readJSON(allJsonFile);
+    const localUpdates = [];
+
+    Object.keys(recipes).forEach((recipe) => {
+      const version = recipes[recipe];
+
+      // Find recipe in local recipe repository
+      const localRecipe = allJson.find(r => r.id === recipe);
+
+      if (localRecipe && semver.lt(version, localRecipe.version)) {
+        localUpdates.push(recipe);
+      }
+    });
+
+    const updates = [
+      ...remoteUpdates,
+      ...localUpdates,
+    ];
+    debug('Got update information (local, remote):', localUpdates, remoteUpdates);
+
     const length = updates.length - 1;
     const syncUpdate = async (i) => {
       const update = updates[i];
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index f65faa5a5..fda18b514 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -83,6 +83,7 @@ export default class ServicesStore extends Store {
     this.actions.service.openDevTools.listen(this._openDevTools.bind(this));
     this.actions.service.openDevToolsForActiveService.listen(this._openDevToolsForActiveService.bind(this));
     this.actions.service.setHibernation.listen(this._setHibernation.bind(this));
+    this.actions.service.shareSettingsWithServiceProcess.listen(this._shareSettingsWithServiceProcess.bind(this));
 
     this.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -116,6 +117,11 @@ export default class ServicesStore extends Store {
     );
 
     reaction(
+      () => this.stores.settings.app.adaptableDarkMode,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+
+    reaction(
       () => this.stores.settings.app.universalDarkMode,
       () => this._shareSettingsWithServiceProcess(),
     );
@@ -766,7 +772,10 @@ export default class ServicesStore extends Store {
   }
 
   _shareSettingsWithServiceProcess() {
-    const settings = this.stores.settings.app;
+    const settings = {
+      ...this.stores.settings.app,
+      isDarkThemeActive: this.stores.ui.isDarkThemeActive,
+    };
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
       args: settings,
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index df0fc77e9..8a5ee7204 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -68,7 +68,6 @@ export default class SettingsStore extends Store {
       () => this.all.app.locked,
       () => {
         const { router } = window.ferdi.stores;
-
         if (this.all.app.locked && this.all.app.lockingFeatureEnabled) {
           // App just got locked, redirect to unlock screen
           router.push('/auth/locked');
@@ -80,9 +79,30 @@ export default class SettingsStore extends Store {
       },
     );
 
+    // Inactivity lock timer
+    let inactivityTimer;
+    remote.getCurrentWindow().on('blur', () => {
+      if (this.all.app.inactivityLock !== 0) {
+        inactivityTimer = setTimeout(() => {
+          this.actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, this.all.app.inactivityLock * 1000 * 60);
+      }
+    });
+    remote.getCurrentWindow().on('focus', () => {
+      if (inactivityTimer) {
+        clearTimeout(inactivityTimer);
+      }
+    });
+
     // Make sure to lock app on launch if locking feature is enabled
     setTimeout(() => {
-      if (this.all.app.lockingFeatureEnabled) {
+      const isLoggedIn = Boolean(localStorage.getItem('authToken'));
+      if (isLoggedIn && this.all.app.lockingFeatureEnabled) {
         // Disable lock first - otherwise the lock might not get activated corrently
         this.actions.settings.update({
           type: 'app',
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index 9680c5bcc..6941cf086 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,23 +1,41 @@
 import {
-  action,
-  observable,
-  computed,
-  reaction,
+  action, observable, computed, reaction,
 } from 'mobx';
 import { theme } from '@meetfranz/theme';
+import { remote } from 'electron';
 
 import Store from './lib/Store';
+import { isMac } from '../environment';
+
+const { nativeTheme, systemPreferences } = remote;
 
 export default class UIStore extends Store {
   @observable showServicesUpdatedInfoBar = false;
 
+  @observable isOsDarkThemeActive = isMac
+    ? nativeTheme.shouldUseDarkColors
+    : false;
+
   constructor(...args) {
     super(...args);
 
     // Register action handlers
     this.actions.ui.openSettings.listen(this._openSettings.bind(this));
     this.actions.ui.closeSettings.listen(this._closeSettings.bind(this));
-    this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
+    this.actions.ui.toggleServiceUpdatedInfoBar.listen(
+      this._toggleServiceUpdatedInfoBar.bind(this),
+    );
+
+    // Listen for theme change on MacOS
+    if (isMac) {
+      systemPreferences.subscribeNotification(
+        'AppleInterfaceThemeChangedNotification',
+        () => {
+          this.isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
+          this.actions.service.shareSettingsWithServiceProcess();
+        },
+      );
+    }
   }
 
   setup() {
@@ -31,11 +49,23 @@ export default class UIStore extends Store {
   @computed get showMessageBadgesEvenWhenMuted() {
     const settings = this.stores.settings.all;
 
-    return (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted) || !settings.app.isAppMuted;
+    return (
+      (settings.app.isAppMuted && settings.app.showMessageBadgeWhenMuted)
+      || !settings.app.isAppMuted
+    );
   }
 
   @computed get isDarkThemeActive() {
-    return this.stores.settings.all.app.darkMode;
+    const isMacWithAdaptableInDarkMode = isMac
+      && this.stores.settings.all.app.adaptableDarkMode
+      && this.isOsDarkThemeActive;
+    const isMacWithoutAdaptableInDarkMode = isMac
+      && this.stores.settings.all.app.darkMode
+      && !this.stores.settings.all.app.adaptableDarkMode;
+    const isNotMacInDarkMode = !isMac && this.stores.settings.all.app.darkMode;
+    return !!(isMacWithAdaptableInDarkMode
+      || isMacWithoutAdaptableInDarkMode
+      || isNotMacInDarkMode);
   }
 
   @computed get theme() {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 486de8a49..cfc857c2e 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -82,7 +82,8 @@ export default class Request {
   }
 
   reload() {
-    return this.execute(...this._currentApiCall.args);
+    const args = this._currentApiCall ? this._currentApiCall.args : [];
+    return this.execute(...args);
   }
 
   retry = () => this.reload();