5 files changed, 27 insertions, 22 deletions

diff --git a/all.json b/all.json
index da38483..34400b1 100644
--- a/all.json
+++ b/all.json
@@ -1122,7 +1122,7 @@
     "featured": false,
     "id": "office365-owa",
     "name": "Office 365 Outlook",
-    "version": "1.4.6",
+    "version": "1.5.0",
     "aliases": [
       "live.com"
     ],
diff --git a/docs/configuration.md b/docs/configuration.md
index ee44081..ab496c6 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -78,6 +78,8 @@ Services like Slack or HipChat have direct messages e.g. a mention or message to
 Info message that will be displayed in the add/edit service preferences screen.
 * `boolean` **disablewebsecurity** _default: false_<br />
 Some services like hangoutschat need the web security disabled.
+* `boolean` **allowFavoritesDelineationInUnreadCount** _default: false_<br />
+Services like Outlook differentiate between favorites vs other folders. Setting this to `true` will allow the exclusion of the message counts from those non-favorite folders.
 
 ## Example
 
diff --git a/recipes/office365-owa/package.json b/recipes/office365-owa/package.json
index 354578d..56690e2 100644
--- a/recipes/office365-owa/package.json
+++ b/recipes/office365-owa/package.json
@@ -1,7 +1,7 @@
 {
   "id": "office365-owa",
   "name": "Office 365 Outlook",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "license": "MIT",
   "aliases": [
     "live.com"
@@ -10,6 +10,7 @@
     "serviceURL": "https://outlook.office365.com/mail/",
     "hasNotificationSound": true,
     "hasHostedOption": true,
-    "hasCustomUrl": true
+    "hasCustomUrl": true,
+    "allowFavoritesDelineationInUnreadCount": true
   }
 }
diff --git a/recipes/office365-owa/webview.js b/recipes/office365-owa/webview.js
index 0ac258c..b897c8d 100644
--- a/recipes/office365-owa/webview.js
+++ b/recipes/office365-owa/webview.js
@@ -1,4 +1,18 @@
-module.exports = Ferdi => {
+module.exports = (Ferdi, settings) => {
+  const collectCounts = (selector) => {
+    let unreadCount = 0;
+    const foldersElement = document.querySelector(selector);
+    if (foldersElement) {
+      const allScreenReaders = foldersElement.querySelectorAll('span.screenReaderOnly');
+      for (const child of allScreenReaders) {
+        if (child.previousSibling) {
+          unreadCount += Ferdi.safeParseInt(child.previousSibling.innerText);
+        }
+      }
+    }
+    return unreadCount;
+  };
+
   const getMessages = () => {
     let directUnreadCount = 0;
     let indirectUnreadCount = 0;
@@ -8,25 +22,13 @@ module.exports = Ferdi => {
       directUnreadCount = Ferdi.safeParseInt(jQuery("span[title*='Inbox'] + div > span").first().text());
     } else {
       // new app
-      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.previousSibling) {
-            directUnreadCount += Ferdi.safeParseInt(child.previousSibling.innerText);
-          }
-        }
+      if (settings.onlyShowFavoritesInUnreadCount === true) {
+        directUnreadCount = collectCounts('div[role=tree]:nth-child(2)'); // favorites
+      } else {
+        directUnreadCount = collectCounts('div[role=tree]:nth-child(3)'); // folders
       }
 
-      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.previousSibling) {
-            indirectUnreadCount += Ferdi.safeParseInt(child.previousSibling.innerText);
-          }
-        }
-      }
+      indirectUnreadCount = collectCounts('div[role=tree]:nth-child(4)'); // groups
     }
 
     Ferdi.setBadge(directUnreadCount, indirectUnreadCount);
diff --git a/scripts/package.js b/scripts/package.js
index 2675ffb..79db480 100644
--- a/scripts/package.js
+++ b/scripts/package.js
@@ -133,7 +133,7 @@ const compress = (src, dest) => new Promise((resolve, reject) => {
     }
     if (config.config && typeof config.config === "object") {
       const configKeys = Object.keys(config.config);
-      const knownConfigKeys = ['serviceURL', 'hasTeamId', 'urlInputPrefix', 'urlInputSuffix', 'hasHostedOption', 'hasCustomUrl', 'hasNotificationSound', 'hasDirectMessages', 'hasIndirectMessages', 'message', 'disablewebsecurity'];
+      const knownConfigKeys = ['serviceURL', 'hasTeamId', 'urlInputPrefix', 'urlInputSuffix', 'hasHostedOption', 'hasCustomUrl', 'hasNotificationSound', 'hasDirectMessages', 'hasIndirectMessages', 'allowFavoritesDelineationInUnreadCount', 'message', 'disablewebsecurity'];
       const unrecognizedConfigKeys = configKeys.filter(x => !knownConfigKeys.includes(x));
       if (unrecognizedConfigKeys.length > 0) {
         configErrors.push(`The recipe's package.json contains the following keys that are not recognized: ${unrecognizedConfigKeys}`);