1 files changed, 109 insertions, 24 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 65e68e4d7..934a8a6e0 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,23 +1,27 @@
+import { shell, remote } from 'electron';
 import {
   action,
   reaction,
   computed,
   observable,
 } from 'mobx';
-import { debounce, remove } from 'lodash';
+import { remove } from 'lodash';
 import ms from 'ms';
-import { remote } from 'electron';
+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 { gaEvent, statsEvent } from '../lib/analytics';
+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';
+import { KEEP_WS_LOADED_USID } from '../config';
 
-const debug = require('debug')('Franz:ServiceStore');
+const debug = require('debug')('Ferdi:ServiceStore');
 
 const { app } = remote;
 
@@ -36,6 +40,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);
 
@@ -49,6 +58,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));
@@ -72,6 +82,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),
@@ -98,6 +109,16 @@ export default class ServicesStore extends Store {
       () => this.stores.settings.app.spellcheckerLanguage,
       () => this._shareSettingsWithServiceProcess(),
     );
+
+    reaction(
+      () => this.stores.settings.app.darkMode,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+
+    reaction(
+      () => this.stores.settings.app.universalDarkMode,
+      () => this._shareSettingsWithServiceProcess(),
+    );
   }
 
   @computed get all() {
@@ -128,7 +149,35 @@ export default class ServicesStore extends Store {
     const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings;
     const services = this.allServicesRequest.execute().result || [];
     const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled);
-    return keepAllWorkspacesLoaded ? filteredServices : workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+
+    let displayedServices;
+    if (keepAllWorkspacesLoaded) {
+      // Keep all enabled services loaded
+      displayedServices = filteredServices;
+    } else {
+      // Keep all services in current workspace loaded
+      displayedServices = workspaceStore.filterServicesByActiveWorkspace(filteredServices);
+
+      // Keep all services active in workspaces that should be kept loaded
+      for (const workspace of this.stores.workspaces.workspaces) {
+        // Check if workspace needs to be kept loaded
+        if (workspace.services.includes(KEEP_WS_LOADED_USID)) {
+          // Get services for workspace
+          const serviceIDs = workspace.services.filter(i => i !== KEEP_WS_LOADED_USID);
+          const wsServices = filteredServices.filter(service => serviceIDs.includes(service.id));
+
+          displayedServices = [
+            ...displayedServices,
+            ...wsServices,
+          ];
+        }
+      }
+
+      // Make sure every service is in the list only once
+      displayedServices = displayedServices.filter((v, i, a) => a.indexOf(v) === i);
+    }
+
+    return displayedServices;
   }
 
   @computed get filtered() {
@@ -185,7 +234,6 @@ export default class ServicesStore extends Store {
 
     if (redirect) {
       this.stores.router.push('/settings/recipes');
-      gaEvent('Service', 'create', recipeId);
     }
   }
 
@@ -262,7 +310,6 @@ export default class ServicesStore extends Store {
 
     if (redirect) {
       this.stores.router.push('/settings/services');
-      gaEvent('Service', 'update', service.recipe.id);
     }
   }
 
@@ -277,19 +324,35 @@ export default class ServicesStore extends Store {
       remove(result, c => c.id === serviceId);
     });
 
-    const service = this.one(serviceId);
-
     await request._promise;
     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;
+    }
 
-    gaEvent('Service', 'delete', service.recipe.id);
+    // 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);
     await request._promise;
-    gaEvent('Service', 'clear cache');
   }
 
   @action _setActive({ serviceId, keepActiveRoute }) {
@@ -301,7 +364,9 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
-    statsEvent('activate-service', service.recipe.id);
+    // Update list of last used services
+    this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId);
+    this.lastUsedServices.unshift(serviceId);
 
     this._focusActiveService();
   }
@@ -406,7 +471,19 @@ export default class ServicesStore extends Store {
         },
       });
     } else if (channel === 'notification') {
-      const options = args[0].options;
+      const { options } = args[0];
+
+      // Check if we are in scheduled Do-not-Disturb time
+      const {
+        scheduledDNDEnabled,
+        scheduledDNDStart,
+        scheduledDNDEnd,
+      } = this.stores.settings.all.app;
+
+      if (scheduledDNDEnabled && isInTimeframe(scheduledDNDStart, scheduledDNDEnd)) {
+        return;
+      }
+
       if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
@@ -414,8 +491,17 @@ export default class ServicesStore extends Store {
       }
 
       if (service.isNotificationEnabled) {
-        const title = typeof args[0].title === 'string' ? args[0].title : service.name;
-        options.body = typeof options.body === 'string' ? options.body : '';
+        let title = `Notification from ${service.name}`;
+        if (!this.stores.settings.all.app.privateNotifications) {
+          options.body = typeof options.body === 'string' ? options.body : '';
+          title = typeof args[0].title === 'string' ? args[0].title : service.name;
+        } else {
+          // Remove message data from notification in private mode
+          options.body = '';
+          options.icon = '/assets/img/notification-badge.gif';
+        }
+
+        console.log(title, options);
 
         this.actions.app.notify({
           notificationId: args[0].notificationId,
@@ -533,7 +619,7 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorderService({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
+    const { showDisabledServices } = this.stores.settings.all.app;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
@@ -552,8 +638,6 @@ export default class ServicesStore extends Store {
         service.order = services[s.id];
       });
     });
-
-    this._reorderAnalytics();
   }
 
   @action _toggleNotifications({ serviceId }) {
@@ -598,6 +682,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;
@@ -629,8 +718,8 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
-    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+    const { showMessageBadgeWhenMuted } = this.stores.settings.all.app;
+    const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     const unreadDirectMessageCount = this.allDisplayed
       .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
@@ -759,10 +848,6 @@ export default class ServicesStore extends Store {
     }
   }
 
-  _reorderAnalytics = debounce(() => {
-    gaEvent('Service', 'order');
-  }, ms('5s'));
-
   _wrapIndex(index, delta, size) {
     return (((index + delta) % size) + size) % size;
   }