6 files changed, 77 insertions, 2 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 5bae6e8d4..40d98cf42 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -22,6 +22,7 @@ import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 import { isValidExternalURL } from '../helpers/url-helpers';
+import { sleep } from '../helpers/async-helpers';
 
 const debug = require('debug')('Ferdi:AppStore');
 
@@ -317,6 +318,8 @@ export default class AppStore extends Store {
 
     await clearAppCache._promise;
 
+    await sleep(ms('1s'));
+
     this.getAppCacheSizeRequest.execute();
 
     this.isClearingAllCache = false;
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index c39b6d7f3..3d9542245 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -20,6 +20,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 { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -83,5 +84,6 @@ 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);
   }
 }
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index 7f91049df..8b2bde5df 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -108,7 +108,7 @@ export default class RecipesStore extends Store {
   async _checkIfRecipeIsInstalled() {
     const { router } = this.stores;
 
-    const match = matchRoute('/settings/services/add/:id', router.location.pathname);
+    const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname);
     if (match) {
       const recipeId = match.id;
 
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index 2587d4eef..a92f4c685 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -1,3 +1,4 @@
+import { ipcRenderer } from 'electron';
 import { action, computed, observable } from 'mobx';
 import ms from 'ms';
 
@@ -12,6 +13,8 @@ export default class RequestStore extends Store {
 
   @observable showRequiredRequestsError = false;
 
+  @observable localServerPort = 45569;
+
   retries = 0;
 
   retryDelay = ms('2s');
@@ -29,6 +32,12 @@ export default class RequestStore extends Store {
   setup() {
     this.userInfoRequest = this.stores.user.getUserInfoRequest;
     this.servicesRequest = this.stores.services.allServicesRequest;
+
+    ipcRenderer.on('localServerPort', (event, data) => {
+      if (data.port) {
+        this.localServerPort = data.port;
+      }
+    });
   }
 
   @computed get areRequiredRequestsSuccessful() {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 3173004d4..185a6f0ae 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,3 +1,4 @@
+import { shell } from 'electron';
 import {
   action,
   reaction,
@@ -6,12 +7,15 @@ import {
 } from 'mobx';
 import { remove } from 'lodash';
 import ms from 'ms';
+import fs from 'fs-extra';
+import path from 'path';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
 import { isInTimeframe } from '../helpers/schedule-helpers';
+import { getRecipeDirectory, getDevRecipeDirectory } from '../helpers/recipe-helpers';
 import { workspaceStore } from '../features/workspaces';
 import { serviceLimitStore } from '../features/serviceLimit';
 import { RESTRICTION_TYPES } from '../models/Service';
@@ -34,6 +38,11 @@ export default class ServicesStore extends Store {
 
   @observable filterNeedle = null;
 
+  // Array of service IDs that have recently been used
+  // [0] => Most recent, [n] => Least recent
+  // No service ID should be in the list multiple times, not all service IDs have to be in the list
+  @observable lastUsedServices = [];
+
   constructor(...args) {
     super(...args);
 
@@ -47,6 +56,7 @@ export default class ServicesStore extends Store {
     this.actions.service.createFromLegacyService.listen(this._createFromLegacyService.bind(this));
     this.actions.service.updateService.listen(this._updateService.bind(this));
     this.actions.service.deleteService.listen(this._deleteService.bind(this));
+    this.actions.service.openDarkmodeCss.listen(this._openDarkmodeCss.bind(this));
     this.actions.service.clearCache.listen(this._clearCache.bind(this));
     this.actions.service.setWebviewReference.listen(this._setWebviewReference.bind(this));
     this.actions.service.detachService.listen(this._detachService.bind(this));
@@ -70,6 +80,7 @@ export default class ServicesStore extends Store {
     this.actions.service.toggleAudio.listen(this._toggleAudio.bind(this));
     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.registerReactions([
       this._focusServiceReaction.bind(this),
@@ -101,6 +112,11 @@ export default class ServicesStore extends Store {
       () => this.stores.settings.app.darkMode,
       () => this._shareSettingsWithServiceProcess(),
     );
+
+    reaction(
+      () => this.stores.settings.app.universalDarkMode,
+      () => this._shareSettingsWithServiceProcess(),
+    );
   }
 
   @computed get all() {
@@ -310,6 +326,27 @@ export default class ServicesStore extends Store {
     this.actionStatus = request.result.status;
   }
 
+  @action async _openDarkmodeCss({ recipe }) {
+    // Get directory for recipe
+    const normalDirectory = getRecipeDirectory(recipe);
+    const devDirectory = getDevRecipeDirectory(recipe);
+    let directory;
+
+    if (await fs.pathExists(normalDirectory)) {
+      directory = normalDirectory;
+    } else if (await fs.pathExists(devDirectory)) {
+      directory = devDirectory;
+    } else {
+      // Recipe cannot be found on drive
+      return;
+    }
+
+    // Create and open darkmode.css
+    const file = path.join(directory, 'darkmode.css');
+    await fs.ensureFile(file);
+    shell.showItemInFolder(file);
+  }
+
   @action async _clearCache({ serviceId }) {
     this.clearCacheRequest.reset();
     const request = this.clearCacheRequest.execute(serviceId);
@@ -325,6 +362,10 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
+    // Update list of last used services
+    this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
+    this.lastUsedServices.unshift(serviceId);
+
     this._focusActiveService();
   }
 
@@ -370,6 +411,7 @@ export default class ServicesStore extends Store {
       service.initializeWebViewEvents({
         handleIPCMessage: this.actions.service.handleIPCMessage,
         openWindow: this.actions.service.openWindow,
+        stores: this.stores,
       });
       service.initializeWebViewListener();
     }
@@ -638,6 +680,11 @@ export default class ServicesStore extends Store {
     }
   }
 
+  @action _setHibernation({ serviceId, hibernating }) {
+    const service = this.one(serviceId);
+    service.isHibernating = hibernating;
+  }
+
   // Reactions
   _focusServiceReaction() {
     const service = this.active;
@@ -727,6 +774,8 @@ export default class ServicesStore extends Store {
     const serviceData = data;
     const recipe = this.stores.recipes.one(recipeId);
 
+    if (!recipe) return;
+
     if (recipe.hasTeamId && recipe.hasCustomUrl && data.team && data.customUrl) {
       delete serviceData.team;
     }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 8c4cd47eb..df0fc77e9 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -9,7 +9,7 @@ import Request from './lib/Request';
 import { getLocale } from '../helpers/i18n-helpers';
 import { API } from '../environment';
 
-import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
+import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const debug = require('debug')('Ferdi:SettingsStore');
@@ -53,6 +53,18 @@ export default class SettingsStore extends Store {
     );
 
     reaction(
+      () => this.all.app.server,
+      (server) => {
+        if (server === LOCAL_SERVER) {
+          ipcRenderer.send('startLocalServer');
+        }
+      },
+      {
+        fireImmediately: true,
+      },
+    );
+
+    reaction(
       () => this.all.app.locked,
       () => {
         const { router } = window.ferdi.stores;