Fix notifications, badge, and icon for The Lounge (#812)

4 files changed, 85 insertions, 4 deletions

diff --git a/recipes/thelounge/icon.svg b/recipes/thelounge/icon.svg
index a989688..f773754 100644
--- a/recipes/thelounge/icon.svg
+++ b/recipes/thelounge/icon.svg
@@ -1 +1 @@
-<svg height="512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="M170.542 357.786c-15.944-2.444-31.341-6.704-46.024-12.779l-5.493-2.272-44.78 16.973 15.091-33.515-8.914-7.281C48.552 292.879 31 258.503 31 222.119 31 145.96 108.141 84 202.96 84c66.491 0 124.284 30.47 152.885 74.937 6.45.715 12.819 1.716 19.08 3.013C346.379 107.298 280.133 69 202.96 69 99.705 69 16 137.554 16 222.119c0 42.354 20.999 80.691 54.934 108.411l-25.235 56.04 73.085-27.701c18.762 7.762 39.34 13.007 61.07 15.203a134.688 134.688 0 0 1-9.312-16.286z" fill="#818b9e"/><path d="M492 303.273c0-72.144-71.411-130.629-159.5-130.629S173 231.128 173 303.273s71.411 130.629 159.5 130.629c25.834 0 50.229-5.036 71.813-13.965l62.35 23.633-21.528-47.809C474.085 372.112 492 339.406 492 303.273zm-238.5 31.333c-14.636 0-26.5-11.864-26.5-26.5s11.864-26.5 26.5-26.5 26.5 11.864 26.5 26.5-11.864 26.5-26.5 26.5zm79 0c-14.636 0-26.5-11.864-26.5-26.5s11.864-26.5 26.5-26.5 26.5 11.864 26.5 26.5-11.864 26.5-26.5 26.5zm79 0c-14.636 0-26.5-11.864-26.5-26.5s11.864-26.5 26.5-26.5 26.5 11.864 26.5 26.5-11.864 26.5-26.5 26.5z" fill="#455164"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 386 386"><style>.st1{fill:#ff9e18}.st2{fill:#fff}</style><path fill="#415364" d="M0 0h386v386H0z"/><g transform="translate(0 55)"><path class="st1" d="M320.1 100v76.1c0 .7-.4 1.3-.9 1.6l-65.8 37.7c-.6.3-1.3.3-1.8 0l-66.1-38c-.6-.3-.9-.9-.9-1.6V109c0-.7-.4-1.3-.9-1.6L165.5 97c-1.2-.7-2.8.2-2.8 1.6v84.5c0 3.9 2.1 7.6 5.5 9.5l78.7 45.1c3.4 2 7.6 2 11.1 0l78.4-44.9c3.4-2 5.5-5.6 5.5-9.5V92.7c0-3.9-2.1-7.6-5.5-9.5L258 38.3c-3.4-2-7.6-2-11.1 0l-36.3 20.8c-1.2.7-1.2 2.5 0 3.2l18.2 10.4c.6.3 1.3.3 1.8 0l20.9-12c.6-.3 1.3-.3 1.8 0l65.8 37.7c.7.3 1 .9 1 1.6z"/><ellipse class="st2" cx="289.6" cy="138.4" rx="12.4" ry="12.4"/><ellipse class="st2" cx="249.9" cy="138.4" rx="12.4" ry="12.4"/></g><g transform="translate(0 55)"><path class="st2" d="M64.6 176V99.9c0-.7.4-1.3.9-1.6l65.8-37.7c.6-.3 1.3-.3 1.8 0l66.1 38c.6.3.9.9.9 1.6V167c0 .7.4 1.3.9 1.6l18.1 10.4c1.2.7 2.8-.2 2.8-1.6V92.9c0-3.9-2.1-7.6-5.5-9.5l-78.7-45.1c-3.4-2-7.6-2-11.1 0L48.3 83.1c-3.4 2-5.5 5.6-5.5 9.5v90.6c0 3.9 2.1 7.6 5.5 9.5l78.4 44.9c3.4 2 7.6 2 11.1 0l36.3-20.8c1.2-.7 1.2-2.5 0-3.2l-18.2-10.4c-.6-.3-1.3-.3-1.8 0l-20.9 12c-.6.3-1.3.3-1.8 0l-65.8-37.7c-.6-.2-1-.8-1-1.5z"/><ellipse class="st1" cx="95.2" cy="137.6" rx="12.4" ry="12.4"/><ellipse class="st1" cx="134.9" cy="137.6" rx="12.4" ry="12.4"/></g></svg>
\ No newline at end of file
diff --git a/recipes/thelounge/package.json b/recipes/thelounge/package.json
index a3f833b..d7b2632 100644
--- a/recipes/thelounge/package.json
+++ b/recipes/thelounge/package.json
@@ -1,7 +1,7 @@
 {
   "id": "thelounge",
   "name": "The Lounge",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "license": "MIT",
   "config": {
     "hasCustomUrl": true,
diff --git a/recipes/thelounge/webview-unsafe.js b/recipes/thelounge/webview-unsafe.js
new file mode 100644
index 0000000..3f1358a
--- /dev/null
+++ b/recipes/thelounge/webview-unsafe.js
@@ -0,0 +1,7 @@
+// Monkey patch ServiceWorker.postMessage so that it will actually post a notification in Ferdi:
+
+function newPostMessage(options) {
+  window.ferdi.displayNotification(options.title, options);
+}
+  
+ServiceWorker.prototype.postMessage = newPostMessage;
diff --git a/recipes/thelounge/webview.js b/recipes/thelounge/webview.js
index b950e8a..394c867 100644
--- a/recipes/thelounge/webview.js
+++ b/recipes/thelounge/webview.js
@@ -1,17 +1,91 @@
+
+function countsOfUnreadMessagesAfterMarker(unreadMarker) {
+  var children = unreadMarker.parentElement.childNodes;
+  var unread = 0;
+  var unreadHighlighted = 0;
+
+  for(var i = children.length-1; i >= 0; --i) {
+    if (children[i] === unreadMarker) {
+      break;
+    }
+
+    if (children[i].classList === undefined) {
+      continue;
+    }
+
+    if (children[i].classList.contains('msg')) {
+      unread++;
+
+      if (children[i].classList.contains('highlight')) {
+        unreadHighlighted++;
+      }
+    }
+  }
+
+  return [unread, unreadHighlighted];
+}
+
 module.exports = Ferdi => {
+  var unreadMessagesAtLastActivity = 0;
+  var unreadHighlightedMessagesAtLastActivity = 0;
+
   const getMessages = () => {
+    // In order to get a correct tally of unread messages, we must
+    // consider both the badges on the various channels, plus the
+    // number of messages that appear after the 'unread' banner that
+    // appears in the page. In the latter case, we should ignore any
+    // messages that arrived before or while the app has focus.
+
+    let direct = 0;
+    var directElements = document.querySelectorAll('.badge.highlight');
+
+    for (const directElement of directElements) {
+      if (directElement.textContent.length > 0) {
+        direct += Ferdi.safeParseInt(directElement.textContent);
+      }
+    }
+
+    let indirect = 0;
     const indirectElements = document.querySelectorAll(
       '.badge:not(.highlight)',
     );
-    const direct = document.querySelectorAll('.badge.highlight').length;
-    let indirect = 0;
     for (const indirectElement of indirectElements) {
       if (indirectElement.textContent.length > 0) {
         indirect++;
       }
     }
+
+    const unreadMarkers = document.querySelectorAll('div.unread-marker');
+
+    if (unreadMarkers.length > 0) {
+      var counts = countsOfUnreadMessagesAfterMarker(unreadMarkers[0]);
+      var unread = counts[0];
+      var unreadHighlighted = counts[1];
+
+      if (document.hasFocus()) {
+        unreadMessagesAtLastActivity = unread;
+        unreadHighlightedMessagesAtLastActivity = unreadHighlighted;
+      }
+
+      if (unread > unreadMessagesAtLastActivity) {
+        if (unreadHighlighted > 0 && unreadHighlighted > unreadHighlightedMessagesAtLastActivity) {
+          direct += (unreadHighlighted - unreadHighlightedMessagesAtLastActivity);
+        } else {
+          indirect++;
+        }
+      }
+    } else {
+      unreadMessagesAtLastActivity = 0;
+      unreadHighlightedMessagesAtLastActivity = 0;
+    }
+
     Ferdi.setBadge(direct, indirect);
   };
 
   Ferdi.loop(getMessages);
+
+  // We need to monkey patch ServierWorker.postMessage so that notifications
+  // will work, and that needs to be done without context isolation:
+  const path = require('path');
+  Ferdi.injectJSUnsafe(path.join(__dirname, 'webview-unsafe.js'));
 };