1 files changed, 22 insertions, 6 deletions

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'));
 };