6 files changed, 44 insertions, 57 deletions

diff --git a/src/models/Plan.js b/src/models/Plan.js
deleted file mode 100644
index 3dedf0d5e..000000000
--- a/src/models/Plan.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// @flow
-
-export default class Plan {
-  month = {
-    id: '',
-    price: 0,
-  }
-
-  year = {
-    id: '',
-    price: 0,
-  }
-
-  constructor(data) {
-    Object.assign(this, data);
-  }
-}
diff --git a/src/models/Recipe.js b/src/models/Recipe.js
index 4db056f26..0d97d4472 100644
--- a/src/models/Recipe.js
+++ b/src/models/Recipe.js
@@ -1,9 +1,9 @@
-import emailParser from 'address-rfc2822';
 import semver from 'semver';
-import fs from 'fs-extra';
-import path from 'path';
+import { pathExistsSync } from 'fs-extra';
+import { join } from 'path';
 
 export default class Recipe {
+  // Note: Do NOT change these default values. If they change, then the corresponding changes in the recipes needs to be done
   id = '';
 
   name = '';
@@ -12,6 +12,8 @@ export default class Recipe {
 
   version = '';
 
+  aliases = [];
+
   path = '';
 
   serviceURL = '';
@@ -60,9 +62,8 @@ export default class Recipe {
 
     this.id = data.id || this.id;
     this.name = data.name || this.name;
-    this.rawAuthor = data.author || this.author;
-    this.description = data.description || this.description;
     this.version = data.version || this.version;
+    this.aliases = data.aliases || this.aliases;
     this.path = data.path;
 
     this.serviceURL = data.config.serviceURL || this.serviceURL;
@@ -86,18 +87,12 @@ export default class Recipe {
     this.message = data.config.message || this.message;
   }
 
+  // TODO: Need to remove this if its not used anywhere
   get author() {
-    try {
-      const addresses = emailParser.parse(this.rawAuthor);
-      return addresses.map(a => ({ email: a.address, name: a.phrase }));
-    } catch (err) {
-      console.warn(`Not a valid author for ${this.name}`);
-    }
-
     return [];
   }
 
   get hasDarkMode() {
-    return fs.pathExistsSync(path.join(this.path, 'darkmode.css'));
+    return pathExistsSync(join(this.path, 'darkmode.css'));
   }
 }
diff --git a/src/models/RecipePreview.js b/src/models/RecipePreview.js
index cfb22f860..6a9ce3080 100644
--- a/src/models/RecipePreview.js
+++ b/src/models/RecipePreview.js
@@ -7,9 +7,10 @@ export default class RecipePreview {
 
   icon = '';
 
-  // TODO: check if this isn't replaced by `icons`
   featured = false;
 
+  aliases = [];
+
   constructor(data) {
     if (!data.id) {
       throw Error('RecipePreview requires Id');
diff --git a/src/models/Service.js b/src/models/Service.js
index 5656295da..fe56e5a76 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -2,7 +2,7 @@ import { autorun, computed, observable } from 'mobx';
 import { ipcRenderer } from 'electron';
 import { webContents } from '@electron/remote';
 import normalizeUrl from 'normalize-url';
-import path from 'path';
+import { join } from 'path';
 
 import { todosStore } from '../features/todos';
 import { isValidExternalURL } from '../helpers/url-helpers';
@@ -10,11 +10,6 @@ import UserAgent from './UserAgent';
 
 const debug = require('debug')('Ferdi:Service');
 
-export const RESTRICTION_TYPES = {
-  SERVICE_LIMIT: 0,
-  CUSTOM_URL: 1,
-};
-
 export default class Service {
   id = '';
 
@@ -42,8 +37,6 @@ export default class Service {
 
   @observable isMuted = false;
 
-  @observable isHibernating = false;
-
   @observable team = '';
 
   @observable customUrl = '';
@@ -82,10 +75,12 @@ export default class Service {
 
   @observable isHibernationEnabled = false;
 
-  @observable isHibernating = false;
+  @observable isHibernationRequested = false;
 
   @observable lastUsed = Date.now(); // timestamp
 
+  @observable lastHibernated = null; // timestamp
+
   @observable lastPoll = Date.now();
 
   @observable lastPollAnswer = Date.now();
@@ -150,14 +145,11 @@ export default class Service {
     this.recipe = recipe;
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
-    const {
-      hibernate,
-      hibernateOnStartup,
-    } = window.ferdi.stores.settings.app;
+    const { hibernateOnStartup } = window.ferdi.stores.settings.app;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
     const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
-    if (hibernate && hibernateOnStartup && !isActive) {
-      this.isHibernating = true;
+    if (hibernateOnStartup && !isActive) {
+      this.isHibernationRequested = true;
     }
 
     autorun(() => {
@@ -190,6 +182,14 @@ export default class Service {
     return this.recipe.id === todosStore.todoRecipeId;
   }
 
+  @computed get canHibernate() {
+    return this.isHibernationEnabled;
+  }
+
+  @computed get isHibernating() {
+    return this.canHibernate && this.isHibernationRequested;
+  }
+
   get webview() {
     if (this.isTodosService) {
       return todosStore.webview;
@@ -230,7 +230,7 @@ export default class Service {
       return this.iconUrl;
     }
 
-    return path.join(this.recipe.path, 'icon.svg');
+    return join(this.recipe.path, 'icon.svg');
   }
 
   @computed get hasCustomIcon() {
@@ -275,11 +275,17 @@ export default class Service {
       debug(this.name, 'modifyRequestHeaders is not defined in the recipe');
     }
 
-    this.webview.addEventListener('ipc-message', e => handleIPCMessage({
-      serviceId: this.id,
-      channel: e.channel,
-      args: e.args,
-    }));
+    this.webview.addEventListener('ipc-message', async (e) => {
+      if (e.channel === 'inject-js-unsafe') {
+        await Promise.all(e.args.map((script) => this.webview.executeJavaScript(`"use strict"; (() => { ${script} })();`)));
+      } else {
+        handleIPCMessage({
+          serviceId: this.id,
+          channel: e.channel,
+          args: e.args,
+        });
+      }
+    });
 
     this.webview.addEventListener('new-window', (event, url, frameName, options) => {
       debug('new-window', event, url, frameName, options);
@@ -334,6 +340,11 @@ export default class Service {
       this.hasCrashed = true;
     });
 
+    this.webview.addEventListener('found-in-page', ({ result }) => {
+      debug('Found in page', result);
+      this.webview.send('found-in-page', result);
+    });
+
     webviewWebContents.on('login', (event, request, authInfo, callback) => {
       // const authCallback = callback;
       debug('browser login event', authInfo);
diff --git a/src/models/User.js b/src/models/User.js
index 74a39926b..d864dde0c 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -24,8 +24,6 @@ export default class User {
 
   @observable hadSubscription = false;
 
-  @observable isPremium = true;
-
   @observable beta = false;
 
   @observable donor = {};
@@ -49,7 +47,6 @@ export default class User {
     this.lastname = data.lastname || this.lastname;
     this.organization = data.organization || this.organization;
     this.accountType = data.accountType || this.accountType;
-    this.isPremium = true;
     this.beta = data.beta || this.beta;
     this.donor = data.donor || this.donor;
     this.isDonor = data.isDonor || this.isDonor;
diff --git a/src/models/UserAgent.js b/src/models/UserAgent.js
index 6f91d4ed0..930ae19ef 100644
--- a/src/models/UserAgent.js
+++ b/src/models/UserAgent.js
@@ -95,10 +95,10 @@ export default class UserAgent {
   _addWebviewEvents(webview) {
     debug('Adding event handlers');
 
-    this._willNavigateListener = event => this._handleNavigate(event.url, true);
+    this._willNavigateListener = (event) => this._handleNavigate(event.url, true);
     webview.addEventListener('will-navigate', this._willNavigateListener);
 
-    this._didNavigateListener = event => this._handleNavigate(event.url);
+    this._didNavigateListener = (event) => this._handleNavigate(event.url);
     webview.addEventListener('did-navigate', this._didNavigateListener);
   }