3 files changed, 29 insertions, 11 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8e0134d7f..fdb502b6b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -9,13 +9,10 @@ import workspaces from '../features/workspaces';
 import quickSwitch from '../features/quickSwitch';
 import nightlyBuilds from '../features/nightlyBuilds';
 import publishDebugInfo from '../features/publishDebugInfo';
-import settingsWS from '../features/settingsWS';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
 
-import { DEFAULT_FEATURES_CONFIG } from '../config';
-
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(
     this.api.features,
@@ -27,7 +24,7 @@ export default class FeaturesStore extends Store {
     'features',
   );
 
-  @observable features = { ...DEFAULT_FEATURES_CONFIG };
+  @observable features = { };
 
   async setup() {
     this.registerReactions([
@@ -41,12 +38,12 @@ export default class FeaturesStore extends Store {
 
   @computed get anonymousFeatures() {
     return (
-      this.defaultFeaturesRequest.execute().result || DEFAULT_FEATURES_CONFIG
+      this.defaultFeaturesRequest.execute().result || {}
     );
   }
 
   _updateFeatures = () => {
-    const features = { ...DEFAULT_FEATURES_CONFIG };
+    const features = { };
     if (this.stores.user.isLoggedIn) {
       let requestResult = {};
       try {
@@ -77,7 +74,6 @@ export default class FeaturesStore extends Store {
     quickSwitch();
     nightlyBuilds();
     publishDebugInfo();
-    settingsWS(this.stores, this.actions);
     communityRecipes(this.stores, this.actions);
     todos(this.stores, this.actions);
     appearance(this.stores);
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 7cbfdc608..9c851d6f2 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -64,7 +64,7 @@ export default class GlobalErrorStore extends Store {
           this.response = {};
         }
         if (this.error.status === 401) {
-          window.ferdi.stores.app.authRequestFailed = true;
+          window['ferdi'].stores.app.authRequestFailed = true;
           // this.actions.user.logout({ serverLogout: true });
         }
       }
@@ -78,10 +78,10 @@ export default class GlobalErrorStore extends Store {
         },
         error: this.error,
         response: this.response,
-        server: window.ferdi.stores.settings.app.server,
+        server: window['ferdi'].stores.settings.app.server,
       });
     } else {
-      window.ferdi.stores.app.authRequestFailed = false;
+      window['ferdi'].stores.app.authRequestFailed = false;
     }
   });
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4f7ad7442..926ee36f0 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -82,6 +82,7 @@ export default class ServicesStore extends Store {
     this.actions.service.setUnreadMessageCount.listen(
       this._setUnreadMessageCount.bind(this),
     );
+    this.actions.service.setDialogTitle.listen(this._setDialogTitle.bind(this));
     this.actions.service.openWindow.listen(this._openWindow.bind(this));
     this.actions.service.filter.listen(this._filter.bind(this));
     this.actions.service.resetFilter.listen(this._resetFilter.bind(this));
@@ -646,6 +647,12 @@ export default class ServicesStore extends Store {
     service.unreadIndirectMessageCount = count.indirect;
   }
 
+  @action _setDialogTitle({ serviceId, dialogTitle }) {
+    const service = this.one(serviceId);
+
+    service.dialogTitle = dialogTitle;
+  }
+
   @action _setWebviewReference({ serviceId, webview }) {
     const service = this.one(serviceId);
 
@@ -683,6 +690,9 @@ export default class ServicesStore extends Store {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
+        document.title = `Ferdi - ${service.name} ${
+          service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+        } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
         this._focusService({ serviceId: service.id });
         if (this.stores.settings.app.splitMode && !focusEvent) {
           setTimeout(() => {
@@ -741,6 +751,16 @@ export default class ServicesStore extends Store {
 
         break;
       }
+      case 'active-dialog-title': {
+        debug(`Received active dialog title from '${serviceId}'`, args[0]);
+
+        this.actions.service.setDialogTitle({
+          serviceId,
+          dialogTitle: args[0],
+        });
+
+        break;
+      }
       case 'notification': {
         const { options } = args[0];
 
@@ -1063,7 +1083,9 @@ export default class ServicesStore extends Store {
     const service = this.active;
     if (service) {
       this.actions.service.focusService({ serviceId: service.id });
-      document.title = `Ferdi - ${service.name}`;
+      document.title = `Ferdi - ${service.name} ${
+        service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+      } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
     } else {
       debug('No service is active');
     }