1 files changed, 51 insertions, 0 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 41180dd76..4cc6102ff 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,11 +2,17 @@ import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
+const debug = require('debug')('Franz:Service');
+
 export default class Service {
   id = '';
+
   recipe = '';
+
   webview = null;
+
   timer = null;
+
   events = {};
 
   isAttached = false;
@@ -14,22 +20,45 @@ export default class Service {
   @observable isActive = false; // Is current webview active
 
   @observable name = '';
+
   @observable unreadDirectMessageCount = 0;
+
   @observable unreadIndirectMessageCount = 0;
 
   @observable order = 99;
+
   @observable isEnabled = true;
+
   @observable isMuted = false;
+
   @observable team = '';
+
   @observable customUrl = '';
+
   @observable isNotificationEnabled = true;
+
   @observable isBadgeEnabled = true;
+
   @observable isIndirectMessageBadgeEnabled = true;
+
   @observable iconUrl = '';
+
   @observable hasCustomUploadedIcon = false;
+
   @observable hasCrashed = false;
+
   @observable isDarkModeEnabled = false;
 
+  @observable spellcheckerLanguage = null;
+
+  @observable isFirstLoad = true;
+
+  @observable isLoading = true;
+
+  @observable isError = false;
+
+  @observable errorMessage = '';
+
   constructor(data, recipe) {
     if (!data) {
       console.error('Service config not valid');
@@ -71,6 +100,8 @@ export default class Service {
 
     this.proxy = data.proxy !== undefined ? data.proxy : this.proxy;
 
+    this.spellcheckerLanguage = data.spellcheckerLanguage !== undefined ? data.spellcheckerLanguage : this.spellcheckerLanguage;
+
     this.recipe = recipe;
 
     autorun(() => {
@@ -147,9 +178,29 @@ export default class Service {
 
     this.webview.addEventListener('did-start-loading', () => {
       this.hasCrashed = false;
+      this.isLoading = true;
+      this.isError = false;
+    });
+
+    this.webview.addEventListener('did-frame-finish-load', () => {
+      this.isLoading = false;
+
+      if (!this.isError) {
+        this.isFirstLoad = false;
+      }
+    });
+
+    this.webview.addEventListener('did-fail-load', (event) => {
+      debug('Service failed to load', this.name, event);
+      if (event.isMainFrame) {
+        this.isError = true;
+        this.errorMessage = event.errorDescription;
+        this.isLoading = false;
+      }
     });
 
     this.webview.addEventListener('crashed', () => {
+      debug('Service crashed', this.name);
       this.hasCrashed = true;
     });
   }