#34 Switch Office 365 Outlook recipe

3 files changed, 42 insertions, 18 deletions

diff --git a/uncompressed/office365-owa/index.js b/uncompressed/office365-owa/index.js
index c9669b2..9157a2e 100644
--- a/uncompressed/office365-owa/index.js
+++ b/uncompressed/office365-owa/index.js
@@ -1,4 +1 @@
-"use strict";
-
-module.exports = Franz => Franz;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9mZmljZTM2NS1vd2EvaW5kZXguanMiXSwibmFtZXMiOlsibW9kdWxlIiwiZXhwb3J0cyIsIkZyYW56Il0sIm1hcHBpbmdzIjoiOztBQUFBQSxPQUFPQyxPQUFQLEdBQWlCQyxTQUFTQSxLQUExQiIsImZpbGUiOiJvZmZpY2UzNjUtb3dhL2luZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSBGcmFueiA9PiBGcmFuejsiXX0=
\ No newline at end of file
+module.exports = Franz => Franz;
\ No newline at end of file
diff --git a/uncompressed/office365-owa/package.json b/uncompressed/office365-owa/package.json
index 17d2ed8..c68f5d0 100644
--- a/uncompressed/office365-owa/package.json
+++ b/uncompressed/office365-owa/package.json
@@ -1,13 +1,17 @@
 {
-    "id": "office365-owa",
-    "name": "Office 365 Outlook Web App",
-    "version": "1.0.1",
-    "description": "Office 365 Outlook Web App",
-    "main": "index.js",
-    "author": "Adam Birds <adam.birds@adbtechltd.co.uk>",
-    "repository": "https://github.com/adambirds/recipe-office365-owa",
-    "license": "MIT",
-    "config": {
-        "serviceURL": "https://outlook.office365.com/owa"
-    }
+  "id": "office365-owa",
+  "name": "Office 365 Outlook Web App",
+  "version": "1.1.0",
+  "description": "Office 365 Outlook Web App",
+  "main": "index.js",
+  "author": "Adam Birds <adam.birds@adbtechltd.co.uk>",
+  "contributors": [
+    "nonAlgebraic <https://github.com/nonAlgebraic>"
+  ],
+  "license": "MIT",
+  "config": {
+    "serviceURL": "https://outlook.office365.com/owa",
+    "hasNotificationSound": true,
+    "hasTeamId": false
+  }
 }
diff --git a/uncompressed/office365-owa/webview.js b/uncompressed/office365-owa/webview.js
index fa2e187..e144c46 100644
--- a/uncompressed/office365-owa/webview.js
+++ b/uncompressed/office365-owa/webview.js
@@ -1,10 +1,33 @@
-"use strict";
+'use strict';
 
 module.exports = Franz => {
   const getMessages = function getMessages() {
-    const unreadMail = parseInt(jQuery("span[title*='Inbox'] + div > span").first().text(), 10);
+    let unreadMail = 0;
+    
+    if (location.pathname.match(/\/owa/)) {
+      // classic app
+      unreadMail = parseInt(
+        jQuery("span[title*='Inbox'] + div > span")
+          .first()
+          .text(),
+        10
+      );
+    } else {
+      // new app
+      const folders = document.querySelector('div[title="Folders"]');
+      if (!folders) {
+        return;
+      }
+
+      unreadMail = [...folders.parentNode.children].reduce((count, child) => {
+        const unread = child.querySelector('.screenReaderOnly');
+        return unread && unread.textContent === 'unread'
+          ? count + parseInt(unread.previousSibling.textContent, 10)
+          : count;
+      }, 0);
+    }
+
     Franz.setBadge(unreadMail);
   };
   Franz.loop(getMessages);
 };
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm9mZmljZTM2NS1vd2Evd2Vidmlldy5qcyJdLCJuYW1lcyI6WyJtb2R1bGUiLCJleHBvcnRzIiwiRnJhbnoiLCJnZXRNZXNzYWdlcyIsInVucmVhZE1haWwiLCJwYXJzZUludCIsImpRdWVyeSIsImZpcnN0IiwidGV4dCIsInNldEJhZGdlIiwibG9vcCJdLCJtYXBwaW5ncyI6Ijs7QUFBQUEsT0FBT0MsT0FBUCxHQUFrQkMsS0FBRCxJQUFXO0FBQzFCLFFBQU1DLGNBQWMsU0FBU0EsV0FBVCxHQUF1QjtBQUN6QyxVQUFNQyxhQUFhQyxTQUFTQyxPQUFPLG1DQUFQLEVBQTRDQyxLQUE1QyxHQUFvREMsSUFBcEQsRUFBVCxFQUFxRSxFQUFyRSxDQUFuQjtBQUNBTixVQUFNTyxRQUFOLENBQWVMLFVBQWY7QUFDRCxHQUhEO0FBSUFGLFFBQU1RLElBQU4sQ0FBV1AsV0FBWDtBQUNELENBTkQiLCJmaWxlIjoib2ZmaWNlMzY1LW93YS93ZWJ2aWV3LmpzIiwic291cmNlc0NvbnRlbnQiOlsibW9kdWxlLmV4cG9ydHMgPSAoRnJhbnopID0+IHtcbiAgY29uc3QgZ2V0TWVzc2FnZXMgPSBmdW5jdGlvbiBnZXRNZXNzYWdlcygpIHtcbiAgICBjb25zdCB1bnJlYWRNYWlsID0gcGFyc2VJbnQoalF1ZXJ5KFwic3Bhblt0aXRsZSo9J0luYm94J10gKyBkaXYgPiBzcGFuXCIpLmZpcnN0KCkudGV4dCgpLCAxMCk7XG4gICAgRnJhbnouc2V0QmFkZ2UodW5yZWFkTWFpbCk7XG4gIH07XG4gIEZyYW56Lmxvb3AoZ2V0TWVzc2FnZXMpO1xufTtcbiJdfQ==
\ No newline at end of file