1 files changed, 21 insertions, 13 deletions

diff --git a/recipes/office365-owa/webview.js b/recipes/office365-owa/webview.js
index 123158e..0309488 100644
--- a/recipes/office365-owa/webview.js
+++ b/recipes/office365-owa/webview.js
@@ -1,10 +1,11 @@
 module.exports = Ferdi => {
   function getMessages() {
-    let unreadMail = 0;
+    let directUnreadCount = 0;
+    let indirectUnreadCount = 0;
 
     if (location.pathname.match(/\/owa/)) {
       // classic app
-      unreadMail = parseInt(
+      directUnreadCount = parseInt(
         jQuery("span[title*='Inbox'] + div > span")
           .first()
           .text(),
@@ -12,21 +13,28 @@ module.exports = Ferdi => {
       );
     } else {
       // new app
-      const favorites = document.querySelector('div[title="Favorites"]');
-      if (!favorites) {
-        return;
+      const foldersElement = document.querySelector('div[role=tree]:nth-child(3)');
+      if (foldersElement) {
+        const allScreenReaders = foldersElement.querySelectorAll('span.screenReaderOnly');
+        for (const child of allScreenReaders) {
+          if ((child.innerText === 'unread' || child.innerText === 'item') && child.previousSibling) {
+            directUnreadCount += parseInt(child.previousSibling.innerText, 10);
+          }
+        }
       }
-      const folders = Array.from(favorites.nextSibling.childNodes);
 
-      unreadMail = folders.reduce((count, child) => {
-        const unread = child.querySelector('.screenReaderOnly');
-        return unread && unread.textContent === 'unread'
-          ? count + parseInt(unread.previousSibling.textContent, 10)
-          : count;
-      }, 0);
+      const groupsElement = document.querySelector('div[role=tree]:nth-child(4)');
+      if (groupsElement) {
+        const allScreenReaders = groupsElement.querySelectorAll('span.screenReaderOnly');
+        for (const child of allScreenReaders) {
+          if ((child.innerText === 'unread' || child.innerText === 'item') && child.previousSibling) {
+            indirectUnreadCount += parseInt(child.previousSibling.innerText, 10);
+          }
+        }
+      }
     }
 
-    Ferdi.setBadge(unreadMail);
+    Ferdi.setBadge(directUnreadCount, indirectUnreadCount);
   }
 
   Ferdi.loop(getMessages);