1 files changed, 23 insertions, 15 deletions

diff --git a/uncompressed/hangoutschat/webview.js b/uncompressed/hangoutschat/webview.js
index 27a2016..ea8a1b2 100644
--- a/uncompressed/hangoutschat/webview.js
+++ b/uncompressed/hangoutschat/webview.js
@@ -1,30 +1,36 @@
-"use strict";
+module.exports = (Franz) => {
+
+  const muteSelector = '.DQy0Rb';
+  const directMessageSelector = '.eM5l9e.FVKzAb';
+  const indirectMessageSelector = '.PL5Wwe.H7du2 .t5F5nf';
+
+  const isMuted = node => !!node.closest('[role="listitem"]').querySelector(muteSelector);
 
-module.exports = Franz => {
   const getMessages = function getMessages() {
-    const muteSelector = '.DQy0Rb';
+
+    // get unread messages
     let directCount = 0;
-    document.querySelectorAll('.eM5l9e.FVKzAb').forEach(node => {
-      if (!node.closest('content[role="listitem"]').querySelector(muteSelector)) {
+    document.querySelectorAll(directMessageSelector).forEach((node) => {
+      // Hangouts Chat overrides the muted indicator when there is a direct mention
+      if (!isMuted(node)) {
         directCount += 1;
       }
     });
+
     let indirectCount = 0;
-    document.querySelectorAll('.PL5Wwe.H7du2 .t5F5nf').forEach(node => {
-      if (!node.closest('content[role="listitem"]').querySelector(muteSelector)) {
-        indirectCount = +1;
+    document.querySelectorAll(indirectMessageSelector).forEach((node) => {
+      if (!isMuted(node)) {
+        indirectCount += 1;
       }
     });
     indirectCount -= directCount;
+
+    // set Franz badge
     Franz.setBadge(directCount, indirectCount);
   };
 
-  document.addEventListener('click', e => {
-    const {
-      tagName,
-      target,
-      href
-    } = e.target;
+  document.addEventListener('click', (e) => {
+    const { tagName, target, href } = e.target;
 
     if (tagName === 'A' && target === '_blank') {
       e.preventDefault();
@@ -32,5 +38,7 @@ module.exports = Franz => {
       window.open(href);
     }
   });
+
+  // check for new messages every second and update Franz badge
   Franz.loop(getMessages);
-};
\ No newline at end of file
+};