v1.10.4 - Fix ad detection. Handle svg/aria trickery

CHANGELOG

@@ -1,3 +1,6 @@
+v1.10.4
+- Fix ad detection. Handle svg/aria trickery.
+
 v1.10.3
 - Fix mention completion popup - closes #62
 

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "__MSG_extensionName__",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "__MSG_extensionDescription__",
   "default_locale": "en",
   "icons": { "128": "src/icon.png" },

src/app.js

@@ -310,7 +310,7 @@ app.init().then(async () => {
         };
 
         for (const e of selectAllWithBase(node, selector)) {
-            const elementText = visibleText(e);
+            const elementText = ariaText(e) || useText(e) || visibleText(e);
 
             const match = getMatch(elementText);
             if (match) {

src/hide_rules/sponsored/selectors

@@ -1,7 +1,10 @@
 ._3nlk
+[aria-label]
+[aria-labelledby]
 a[role=link]
 a>span:only-of-type
 div[role=button]
 div>a:first-child
 div>a[onmousedown]
 h3>*
+use

src/hide_rules/suggested/selectors

@@ -1,2 +1,5 @@
+[aria-label]
+[aria-labelledby]
 h3
 span[dir]
+use

src/util.js

@@ -237,6 +237,24 @@ function normalizeString(str) {
     return Array.from(str.trim().toLowerCase()).sort().join("");
 }
 
+/** @param {HTMLElement} elem */
+function ariaText(elem) {
+    const labels = elem.getAttribute('aria-labelledby')?.split(' ')
+        .map(id => document.getElementById(id))
+        .filter(e => e);
+
+    const text = [...new Set(labels || [])].map(e => e.textContent).join(' ');
+    return text ? text : elem.getAttribute('aria-label');
+}
+
+/** @param {SVGUseElement} elem */
+function useText(elem) {
+    if (elem.tagName.toUpperCase() != 'USE')
+        return;
+
+    return document.querySelector(elem.href.baseVal)?.textContent;
+}
+
 /** @param {HTMLElement} elem */
 function visibleText(elem) {
     let text = elem.dataset.content ?? "";