Merge pull request #160 from GustavoKatel/notificationTitleFix

Add onNotify event to let recipes update/change notifications before send them.
meetfranz · Oct 30, 2017 · 2e07a02 · 2e07a02
2 parents e6ed06b + 138feed
commit 2e07a02
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
@@ -296,9 +296,12 @@ export default class ServicesStore extends Store {
       }
 
       if (service.isNotificationEnabled) {
+        const title = typeof args[0].title === 'string' ? args[0].title : service.name;
+        options.body = typeof options.body === 'string' ? options.body : '';
+
         this.actions.app.notify({
           notificationId: args[0].notificationId,
-          title: args[0].title,
+          title,
           options,
           serviceId,
         });

diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
@@ -64,6 +64,12 @@ class RecipeWebview {
     });
   }
 
+  onNotify(fn) {
+    if (typeof fn === 'function') {
+      window.Notification.onNotify = fn;
+    }
+  }
+
   initialize(fn) {
     if (typeof fn === 'function') {
       fn();

diff --git a/src/webview/notifications.js b/src/webview/notifications.js
@@ -7,13 +7,13 @@ class Notification {
     this.title = title;
     this.options = options;
     this.notificationId = uuidV1();
-    this.onclick = () => {};
+    this.onclick = () => { };
 
-    ipcRenderer.sendToHost('notification', {
+    ipcRenderer.sendToHost('notification', Notification.onNotify({
       notificationId: this.notificationId,
       title,
       options,
-    });
+    }));
 
     ipcRenderer.on(`notification-onclick:${this.notificationId}`, () => {
       this.onclick();
@@ -42,4 +42,6 @@ Notification.close = () => {
   // no implementation yet
 };
 
+Notification.onNotify = data => data;
+
 window.Notification = Notification;