Merge pull request #354 from eandersons/nextcloud-talk

Nextcloud Talk: Hide unrelated notifications and fix notifications count

4 files changed, 54 insertions, 11 deletions

diff --git a/recipes/nextcloud-talk/README.md b/recipes/nextcloud-talk/README.md
new file mode 100644
index 0000000..e6194c2
--- /dev/null
+++ b/recipes/nextcloud-talk/README.md
@@ -0,0 +1,21 @@
+# Ferdi recipe for Nextcloud Talk
+
+Nextcloud Talk - Chat, video & audio-conferencing using WebRTC.
+
+To add Nextcloud Talk to Ferdi, Nextcloud server address should be provided in the field "Custom server".
+
+## Credits
+
+This recipe is based on [`recipe-nextcloud-talk`](https://github.com/meetfranz/recipe-nextcloud-talk).
+
+## Links
+
+Ferdi:
+
+- [Ferdi](https://getferdi.com/)
+- [Ferdi recipes](https://github.com/getferdi/recipes)
+
+Nextcloud:
+
+- [Nextcloud](https://nextcloud.com/)
+- [Nextcloud Talk](https://apps.nextcloud.com/apps/spreed)
diff --git a/recipes/nextcloud-talk/package.json b/recipes/nextcloud-talk/package.json
index dcb5508..abbdd5a 100644
--- a/recipes/nextcloud-talk/package.json
+++ b/recipes/nextcloud-talk/package.json
@@ -1,8 +1,8 @@
 {
   "id": "nextcloud-talk",
   "name": "Nextcloud Talk",
-  "version": "1.0.2",
-  "description": "Nextcloud Talk",
+  "version": "1.0.3",
+  "description": "Nextcloud Talk - chat, video & audio-conferencing using WebRTC",
   "main": "index.js",
   "author": "Stefan Malzner <stefan@adlk.io>",
   "license": "MIT",
diff --git a/recipes/nextcloud-talk/service.css b/recipes/nextcloud-talk/service.css
index 82dde75..f4f08bc 100644
--- a/recipes/nextcloud-talk/service.css
+++ b/recipes/nextcloud-talk/service.css
@@ -15,7 +15,13 @@ settings links and disable them */
   display: none !important;
 }
 
-/* Hide contacts in the top menu */
-#contactsmenu {
-  display: none;
+/* Hide notifications that are not related to calendar */
+.notifications .notification-wrapper .notification {display: none;}
+.notifications .notification-wrapper .notification[object_type="chat"],
+.notifications .notification-wrapper .notification[object_type="room"]  {
+  display: initial;
 }
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {display: none;}
diff --git a/recipes/nextcloud-talk/webview.js b/recipes/nextcloud-talk/webview.js
index c180d4d..0dfb6ea 100644
--- a/recipes/nextcloud-talk/webview.js
+++ b/recipes/nextcloud-talk/webview.js
@@ -6,13 +6,29 @@ 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)').length;
-    Franz.setBadge(direct, indirect);
+    let direct = 0;
+    const notificationWrapper = document.querySelector(
+      '.notifications .notification-wrapper'
+    );
+
+    if (notificationWrapper) {
+      direct = notificationWrapper.querySelectorAll(
+        '.notification[object_type="chat"], .notification[object_type="room"'
+      ).length;
+    }
+
+    let indirect = 0;
+
+    document.querySelectorAll('.app-navigation-entry__counter').forEach(
+      function(counter) {
+        indirect += Number(counter.textContent);
+      }
+    );
+    Ferdi.setBadge(direct, indirect);
   };
 
-  Franz.loop(getMessages);
-  Franz.injectCSS(_path.default.join(__dirname, 'service.css'));
+  Ferdi.loop(getMessages);
+  Ferdi.injectCSS(_path.default.join(__dirname, 'service.css'));
 };