Don't count muted chats, remove defunct workarounds in FB Messenger (#1)

Co-authored-by: mydarkstar <git@mydarkstar.net>

1 files changed, 7 insertions, 26 deletions

diff --git a/recipes/messenger/webview.js b/recipes/messenger/webview.js
index c90f4ad..1f1d39f 100644
--- a/recipes/messenger/webview.js
+++ b/recipes/messenger/webview.js
@@ -1,34 +1,15 @@
 module.exports = Ferdium => {
   const getMessages = () => {
-    let count = 0;
+    let count = Array.from(document.querySelectorAll('.bp9cbjyn.j83agx80.owycx6da:not(.btwxx1t3)'))
+      .map(elem => {
+        const hasPing = !!elem.querySelector('.pq6dq46d.is6700om.qu0x051f.esr5mh6w.e9989ue4.r7d6kgcz.s45kfl79.emlxlaya.bkmhp75w.spb7xbtv.cyypbtt7.fwizqjfa');
+        const isMuted = !!elem.querySelector('.a8c37x1j.ms05siws.l3qrxjdp.b7h9ocf4.trssfv1o');
 
-    const isNotification = /^\((\d+)\)/.test(document.title);
+        return hasPing && !isMuted;
+      })
+      .reduce((prev, curr) => prev + curr, 0);
 
     /*
-     * Notification case for group chats, workaround by tamas646
-     * see https://github.com/ferdium/ferdium-app/issues/1113#issuecomment-783409154
-     */
-    if (isNotification) {
-      count = Ferdium.safeParseInt(/^\((\d+)\)/.exec(document.title)[1]);
-    } else {
-      /*
-       * Notification case for direct messages, workaround by manavortex
-       * see https://github.com/ferdium/ferdium-app/issues/1113#issuecomment-846611765
-       */
-      count = document.querySelectorAll(
-        '._5fx8:not(._569x),._1ht3:not(._569x)',
-      ).length;
-      if (count === 0) {
-        count = document.querySelectorAll(
-          '.pq6dq46d.is6700om.qu0x051f.esr5mh6w.e9989ue4.r7d6kgcz.s45kfl79.emlxlaya.bkmhp75w.spb7xbtv.cyypbtt7.fwizqjfa',
-        ).length;
-      }
-      if (count === 0) {
-        // might be obsolete, not sure - never ran into this case
-        count = document.querySelectorAll('[aria-label="Mark as read"]').length;
-      }
-    }
-    /*
      * add count of message requests on top of notification counter
      */
     const messageRequestsElement = document.querySelector('._5nxf');