7 files changed, 51 insertions, 7 deletions

diff --git a/src/models/News.js b/src/models/News.js
index e8953ff8c..a96e6550f 100644
--- a/src/models/News.js
+++ b/src/models/News.js
@@ -6,7 +6,7 @@ export default class News {
   type: string = 'primary';
   sticky: bool = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('News requires Id');
     }
diff --git a/src/models/Plan.js b/src/models/Plan.js
index 1f2a44902..e77353824 100644
--- a/src/models/Plan.js
+++ b/src/models/Plan.js
@@ -10,7 +10,7 @@ export default class Plan {
     price: 0,
   }
 
-  constructor(data: Object) {
+  constructor(data) {
     Object.assign(this, data);
   }
 }
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 9971df77c..1fc23ac89 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,10 +1,11 @@
 import emailParser from 'address-rfc2822';
+import semver from 'semver';
 
 export default class Recipe {
   id = '';
   name = '';
   description = '';
-  version = '1.0';
+  version = '';
   path = '';
 
   serviceURL = '';
@@ -15,6 +16,7 @@ export default class Recipe {
   hasTeamId = false;
   hasPredefinedUrl = false;
   hasCustomUrl = false;
+  hasHostedOption = false;
   urlInputPrefix = '';
   urlInputSuffix = '';
 
@@ -30,6 +32,10 @@ export default class Recipe {
       throw Error(`Recipe '${data.name}' requires Id`);
     }
 
+    if (!semver.valid(data.version)) {
+      throw Error(`Version ${data.version} of recipe '${data.name}' is not a valid semver version`);
+    }
+
     this.id = data.id || this.id;
     this.name = data.name || this.name;
     this.rawAuthor = data.author || this.author;
@@ -45,6 +51,7 @@ export default class Recipe {
     this.hasTeamId = data.config.hasTeamId || this.hasTeamId;
     this.hasPredefinedUrl = data.config.hasPredefinedUrl || this.hasPredefinedUrl;
     this.hasCustomUrl = data.config.hasCustomUrl || this.hasCustomUrl;
+    this.hasHostedOption = data.config.hasHostedOption || this.hasHostedOption;
 
     this.urlInputPrefix = data.config.urlInputPrefix || this.urlInputPrefix;
     this.urlInputSuffix = data.config.urlInputSuffix || this.urlInputSuffix;
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index 7b497edf3..525a5c4b5 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -6,7 +6,7 @@ export default class RecipePreview {
   icon: string = ''; // TODO: check if this isn't replaced by `icons`
   featured: bool = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('RecipePreview requires Id');
     }
diff --git a/src/models/Service.js b/src/models/Service.js
index eb68493fe..0b19440e7 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -1,4 +1,4 @@
-import { computed, observable } from 'mobx';
+import { computed, observable, autorun } from 'mobx';
 import path from 'path';
 import normalizeUrl from 'normalize-url';
 
@@ -22,6 +22,7 @@ export default class Service {
   @observable team = '';
   @observable customUrl = '';
   @observable isNotificationEnabled = true;
+  @observable isBadgeEnabled = true;
   @observable isIndirectMessageBadgeEnabled = true;
   @observable customIconUrl = '';
   @observable hasCrashed = false;
@@ -52,19 +53,31 @@ export default class Service {
     this.isNotificationEnabled = data.isNotificationEnabled !== undefined
       ? data.isNotificationEnabled : this.isNotificationEnabled;
 
+    this.isBadgeEnabled = data.isBadgeEnabled !== undefined
+      ? data.isBadgeEnabled : this.isBadgeEnabled;
+
     this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
       ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
 
     this.isMuted = data.isMuted !== undefined ? data.isMuted : this.isMuted;
 
     this.recipe = recipe;
+
+    autorun(() => {
+      if (!this.isEnabled) {
+        this.webview = null;
+        this.isAttached = false;
+        this.unreadDirectMessageCount = 0;
+        this.unreadIndirectMessageCount = 0;
+      }
+    });
   }
 
   @computed get url() {
     if (this.recipe.hasCustomUrl && this.customUrl) {
       let url;
       try {
-        url = normalizeUrl(this.customUrl);
+        url = normalizeUrl(this.customUrl, { stripWWW: false });
       } catch (err) {
         console.error(`Service (${this.recipe.name}): '${this.customUrl}' is not a valid Url.`);
       }
diff --git a/src/models/Settings.js b/src/models/Settings.js
new file mode 100644
index 000000000..ca44da258
--- /dev/null
+++ b/src/models/Settings.js
@@ -0,0 +1,24 @@
+import { observable, extendObservable } from 'mobx';
+import { DEFAULT_APP_SETTINGS } from '../config';
+
+export default class Settings {
+  @observable autoLaunchOnStart = DEFAULT_APP_SETTINGS.autoLaunchOnStart;
+  @observable autoLaunchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
+  @observable runInBackground = DEFAULT_APP_SETTINGS.runInBackground;
+  @observable enableSystemTray = DEFAULT_APP_SETTINGS.enableSystemTray;
+  @observable minimizeToSystemTray = DEFAULT_APP_SETTINGS.minimizeToSystemTray;
+  @observable showDisabledServices = DEFAULT_APP_SETTINGS.showDisabledServices;
+  @observable showMessageBadgeWhenMuted = DEFAULT_APP_SETTINGS.showMessageBadgeWhenMuted;
+  @observable enableSpellchecking = DEFAULT_APP_SETTINGS.enableSpellchecking;
+  @observable locale = DEFAULT_APP_SETTINGS.locale;
+  @observable beta = DEFAULT_APP_SETTINGS.beta;
+  @observable isAppMuted = DEFAULT_APP_SETTINGS.isAppMuted;
+
+  constructor(data) {
+    Object.assign(this, data);
+  }
+
+  update(data) {
+    extendObservable(this, data);
+  }
+}
diff --git a/src/models/User.js b/src/models/User.js
index 94b579928..e2d2fc0c8 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -16,7 +16,7 @@ export default class User {
   @observable isDonor = false;
   @observable isMiner = false;
 
-  constructor(data: Object) {
+  constructor(data) {
     if (!data.id) {
       throw Error('User requires Id');
     }