Merge pull request #353 from eandersons/nextcloud-calendar

Nextcloud Calendar: Display only calendar related notifications and their count

3 files changed, 15 insertions, 9 deletions

diff --git a/recipes/nextcloud-calendar/package.json b/recipes/nextcloud-calendar/package.json
index ee23655..7b44cb1 100644
--- a/recipes/nextcloud-calendar/package.json
+++ b/recipes/nextcloud-calendar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "nextcloud-calendar",
   "name": "Nextcloud Calendar",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Ferdi recipe for Nextcloud Calendar.",
   "main": "index.js",
   "author": "Edgars Andersons <Edgars+github@gaitenis.id.lv>",
diff --git a/recipes/nextcloud-calendar/service.css b/recipes/nextcloud-calendar/service.css
index 833d5a8..a0016ae 100644
--- a/recipes/nextcloud-calendar/service.css
+++ b/recipes/nextcloud-calendar/service.css
@@ -10,3 +10,12 @@ settings links and disable them */
 
 /* Hide "More" link in the top menu */
 #more-apps {display: none !important;}
+
+/* Hide notifications that are not related to calendar */
+.notifications .notification-wrapper .notification:not([object_type="dav"]) {
+    display: none;
+}
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {display: none;}
diff --git a/recipes/nextcloud-calendar/webview.js b/recipes/nextcloud-calendar/webview.js
index 53496fe..e36a9d4 100644
--- a/recipes/nextcloud-calendar/webview.js
+++ b/recipes/nextcloud-calendar/webview.js
@@ -6,18 +6,15 @@ function _interopRequireDefault(obj) {
   return obj && obj.__esModule ? obj : {default: obj};
 }
 
-module.exports = Franz => {
+module.exports = Ferdi => {
   const getMessages = function getMessages() {
     const direct = document.querySelectorAll(
-      '.app-navigation-entry-utils-counter.highlighted'
-    ).length;
-    const indirect = document.querySelectorAll(
-      '.app-navigation-entry-utils-counter:not(.highlighted)'
+      '.notifications .notification-wrapper .notification[object_type="dav"]'
     ).length;
 
-    Franz.setBadge(direct, indirect);
+    Ferdi.setBadge(direct);
   };
 
-  Franz.loop(getMessages);
-  Franz.injectCSS(_path.default.join(__dirname, 'service.css'));
+  Ferdi.loop(getMessages);
+  Ferdi.injectCSS(_path.default.join(__dirname, 'service.css'));
 };