5 files changed, 116 insertions, 29 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 14bdab094..5a6c12ee1 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -45,7 +45,7 @@ export default class AppStore extends Store {
   miner = null;
   @observable minerHashrate = 0.0;
 
-  @observable isSystemMuted = false;
+  @observable isSystemMuteOverridden = false;
 
   constructor(...args) {
     super(...args);
@@ -67,6 +67,7 @@ export default class AppStore extends Store {
       this._setLocale.bind(this),
       this._handleMiner.bind(this),
       this._handleMinerThrottle.bind(this),
+      this._muteAppHandler.bind(this),
     ]);
   }
 
@@ -115,6 +116,14 @@ export default class AppStore extends Store {
       }
     });
 
+    // Handle deep linking (franz://)
+    ipcRenderer.on('navigateFromDeepLink', (event, data) => {
+      const { url } = data;
+      if (!url) return;
+
+      this.stores.router.push(data.url);
+    });
+
     // Check system idle time every minute
     setInterval(() => {
       this.idleTime = idleTimer.getIdleTime();
@@ -127,16 +136,22 @@ export default class AppStore extends Store {
 
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });
 
+    // Global Mute
+    key(
+      '⌘+shift+m ctrl+shift+m', () => {
+        this.actions.app.toggleMuteApp();
+      });
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();
@@ -144,6 +159,8 @@ export default class AppStore extends Store {
 
   // Actions
   @action _notify({ title, options, notificationId, serviceId = null }) {
+    if (this.stores.settings.all.isAppMuted) return;
+
     const notification = new window.Notification(title, options);
     notification.onclick = (e) => {
       if (serviceId) {
@@ -154,6 +171,11 @@ export default class AppStore extends Store {
         });
 
         this.actions.service.setActive({ serviceId });
+
+        if (!isMac) {
+          const mainWindow = remote.getCurrentWindow();
+          mainWindow.restore();
+        }
       }
     };
   }
@@ -211,16 +233,18 @@ export default class AppStore extends Store {
     this.healthCheckRequest.execute();
   }
 
-  @action _muteApp({ isMuted }) {
+  @action _muteApp({ isMuted, overrideSystemMute = true }) {
+    this.isSystemMuteOverriden = overrideSystemMute;
+
     this.actions.settings.update({
       settings: {
-        isMuted,
+        isAppMuted: isMuted,
       },
     });
   }
 
   @action _toggleMuteApp() {
-    this._muteApp({ isMuted: !this.stores.settings.all.isMuted });
+    this._muteApp({ isMuted: !this.stores.settings.all.isAppMuted });
   }
 
   // Reactions
@@ -239,8 +263,10 @@ export default class AppStore extends Store {
   _setLocale() {
     const locale = this.stores.settings.all.locale;
 
-    if (locale && locale !== this.locale) {
+    if (locale && Object.prototype.hasOwnProperty.call(locales, locale) && locale !== this.locale) {
       this.locale = locale;
+    } else if (!locale) {
+      this.locale = this._getDefaultLocale();
     }
   }
 
@@ -265,6 +291,10 @@ export default class AppStore extends Store {
       locale = defaultLocale;
     }
 
+    if (!locale) {
+      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
+    }
+
     return locale;
   }
 
@@ -290,6 +320,14 @@ export default class AppStore extends Store {
     }
   }
 
+  _muteAppHandler() {
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    if (!showMessageBadgesEvenWhenMuted) {
+      this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 });
+    }
+  }
+
   // Helpers
   async _appStartsCounter() {
     // we need to wait until the settings request is resolved
@@ -320,6 +358,12 @@ export default class AppStore extends Store {
   }
 
   _systemDND() {
-    this.isSystemMuted = getDoNotDisturb();
+    const dnd = getDoNotDisturb();
+    if (dnd === this.stores.settings.all.isAppMuted || !this.isSystemMuteOverriden) {
+      this.actions.app.muteApp({
+        isMuted: dnd,
+        overrideSystemMute: false,
+      });
+    }
   }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 269cd1526..66f37af26 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -37,6 +37,7 @@ export default class ServicesStore extends Store {
     this.actions.service.toggleService.listen(this._toggleService.bind(this));
     this.actions.service.handleIPCMessage.listen(this._handleIPCMessage.bind(this));
     this.actions.service.sendIPCMessage.listen(this._sendIPCMessage.bind(this));
+    this.actions.service.sendIPCMessageToAllServices.listen(this._sendIPCMessageToAllServices.bind(this));
     this.actions.service.setUnreadMessageCount.listen(this._setUnreadMessageCount.bind(this));
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
@@ -58,6 +59,7 @@ 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
@@ -284,6 +286,7 @@ export default class ServicesStore extends Store {
     if (channel === 'hello') {
       this._initRecipePolling(service.id);
       this._initializeServiceRecipeInWebview(serviceId);
+      this._shareSettingsWithServiceProcess();
     } else if (channel === 'messages') {
       this.actions.service.setUnreadMessageCount({
         serviceId,
@@ -294,7 +297,7 @@ export default class ServicesStore extends Store {
       });
     } else if (channel === 'notification') {
       const options = args[0].options;
-      if (service.recipe.hasNotificationSound || service.isMuted) {
+      if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.isAppMuted) {
         Object.assign(options, {
           silent: true,
         });
@@ -330,7 +333,17 @@ export default class ServicesStore extends Store {
   @action _sendIPCMessage({ serviceId, channel, args }) {
     const service = this.one(serviceId);
 
-    service.webview.send(channel, args);
+    if (service.webview) {
+      service.webview.send(channel, args);
+    }
+  }
+
+  @action _sendIPCMessageToAllServices({ channel, args }) {
+    this.all.forEach(s => this.actions.service.sendIPCMessage({
+      serviceId: s.id,
+      channel,
+      args,
+    }));
   }
 
   @action _openWindow({ event }) {
@@ -457,8 +470,10 @@ export default class ServicesStore extends Store {
     const service = this.active;
 
     if (service) {
-      this.stores.settings.updateSettingsRequest.execute({
-        activeService: service.id,
+      this.actions.settings.update({
+        settings: {
+          activeService: service.id,
+        },
       });
     }
   }
@@ -473,19 +488,26 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const unreadDirectMessageCount = this.enabled
+    const showMessageBadgeWhenMuted = this.stores.settings.all.showMessageBadgeWhenMuted;
+    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+
+    const unreadDirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
       .map(s => s.unreadDirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    const unreadIndirectMessageCount = this.enabled
-      .filter(s => s.isIndirectMessageBadgeEnabled)
+    const unreadIndirectMessageCount = this.allDisplayed
+      .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
       .map(s => s.unreadIndirectMessageCount)
       .reduce((a, b) => a + b, 0);
 
-    this.actions.app.setBadge({
-      unreadDirectMessageCount,
-      unreadIndirectMessageCount,
-    });
+    // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases
+    if (showMessageBadgesEvenWhenMuted) {
+      this.actions.app.setBadge({
+        unreadDirectMessageCount,
+        unreadIndirectMessageCount,
+      });
+    }
   }
 
   _logoutReaction() {
@@ -495,6 +517,13 @@ export default class ServicesStore extends Store {
     }
   }
 
+  _shareSettingsWithServiceProcess() {
+    this.actions.service.sendIPCMessageToAllServices({
+      channel: 'settings-update',
+      args: this.stores.settings.all,
+    });
+  }
+
   _cleanUpTeamIdAndCustomUrl(recipeId, data) {
     const serviceData = data;
     const recipe = this.stores.recipes.one(recipeId);
@@ -527,6 +556,8 @@ export default class ServicesStore extends Store {
 
     if (service) {
       const loop = () => {
+        if (!service.webview) return;
+
         service.webview.send('poll');
 
         setTimeout(loop, delay);
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 331df5c15..da99a720f 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,11 +1,11 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import { action, computed, observable, extendObservable } from 'mobx';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
-import { DEFAULT_APP_SETTINGS } from '../config';
+import SettingsModel from '../models/Settings';
 
 export default class SettingsStore extends Store {
   @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
@@ -18,10 +18,6 @@ export default class SettingsStore extends Store {
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
-
-    // this.registerReactions([
-    //   this._shareSettingsWithMainProcess.bind(this),
-    // ]);
   }
 
   setup() {
@@ -30,14 +26,18 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
-    return observable(Object.assign(DEFAULT_APP_SETTINGS, this.allSettingsRequest.result));
+    return new SettingsModel(this.allSettingsRequest.result);
   }
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    await this.allSettingsRequest.patch((result) => {
+      if (!result) return;
+      extendObservable(result, settings);
+    });
 
-    this._shareSettingsWithMainProcess();
+    // We need a little hack to wait until everything is patched
+    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
 
     gaEvent('Settings', 'update');
   }
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js
index cb45b88b5..5e9cc9ba7 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.js
@@ -1,4 +1,4 @@
-import { action, observable } from 'mobx';
+import { action, observable, computed } from 'mobx';
 
 import Store from './lib/Store';
 
@@ -14,6 +14,12 @@ export default class UIStore extends Store {
     this.actions.ui.toggleServiceUpdatedInfoBar.listen(this._toggleServiceUpdatedInfoBar.bind(this));
   }
 
+  @computed get showMessageBadgesEvenWhenMuted() {
+    const settings = this.stores.settings.all;
+
+    return (settings.isAppMuted && settings.showMessageBadgeWhenMuted) || !settings.isAppMuted;
+  }
+
   // Actions
   @action _openSettings({ path = '/settings' }) {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 1cb2ecac3..09000dcdb 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -26,6 +26,7 @@ export default class UserStore extends Store {
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
   @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+  @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
   @observable isImportLegacyServicesExecuting = false;
   @observable isImportLegacyServicesCompleted = false;
@@ -57,6 +58,7 @@ export default class UserStore extends Store {
     this.actions.user.update.listen(this._update.bind(this));
     this.actions.user.resetStatus.listen(this._resetStatus.bind(this));
     this.actions.user.importLegacyServices.listen(this._importLegacyServices.bind(this));
+    this.actions.user.delete.listen(this._delete.bind(this));
 
     // Reactions
     this.registerReactions([
@@ -212,6 +214,10 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesCompleted = true;
   }
 
+  @action async _delete() {
+    this.deleteAccountRequest.execute();
+  }
+
   // This is a mobx autorun which forces the user to login if not authenticated
   _requireAuthenticatedUser = () => {
     if (this.isTokenExpired) {