1 files changed, 18 insertions, 6 deletions

diff --git a/recipes/zulip/webview.js b/recipes/zulip/webview.js
index 32cb0aa..1989809 100644
--- a/recipes/zulip/webview.js
+++ b/recipes/zulip/webview.js
@@ -1,12 +1,24 @@
 module.exports = Ferdium => {
   const getMessages = () => {
-    const allMessages = Math.round(
-      document.querySelectorAll(
-        '#global_filters .top_left_all_messages .count .value',
-      )[0].textContent,
-    );
-    Ferdium.setBadge(allMessages);
+    // All unread messages
+    const unreadAll = getUnreadCount('top_left_all_messages');
+
+    // Private messages
+    const unreadPrivate = getUnreadCount('top_left_private_messages');
+
+    // @ Mentions messages
+    const unreadMentions = getUnreadCount('top_left_mentions');
+
+    const directMessages = unreadPrivate + unreadMentions;
+    const indirectMessages = unreadAll - directMessages;
+
+    Ferdium.setBadge(directMessages, indirectMessages);
   };
 
   Ferdium.loop(getMessages);
+
+  function getUnreadCount(eltClassName) {
+    const elt = document.querySelectorAll(`#global_filters .${eltClassName} .unread_count`)[0];
+    return elt == null ? 0 : Ferdium.safeParseInt(elt.textContent);
+  }
 };