Added type option to styles.getAllSelectors()

Author: adamlui

chatgpt-widescreen/chromium/extension/lib/styles.js

@@ -2,8 +2,13 @@
 
 window.styles = {
 
-    getAllSelectors(obj) { // used in this.tweaks.styles for spam selectors
-        return Object.values(obj).flatMap(val => typeof val == 'object' ? this.getAllSelectors(val) : val) },
+    getAllSelectors(obj, { type } = {}) { // used in this.tweaks.styles for spam selectors
+        const selectors = Object.values(obj).flatMap(val =>
+            typeof val == 'object' ? this.getAllSelectors(val, { type }) : val)
+        return type == 'css' ? selectors.filter(sel => !sel.startsWith('//'))
+             : type == 'xpath' ? selectors.filter(sel => sel.startsWith('//'))
+             : /* no type */ selectors
+    },
 
     get outerDivSelector() { // requires env.site
         return env.site == 'chatgpt' ? 'div.text-base > div'

chatgpt-widescreen/chromium/extension/lib/sync.js

@@ -62,7 +62,7 @@ window.sync = {
 
     spamBlock() { // requires env.site + sites
         const selectors = sites[env.site]?.selectors?.spam ; if (!selectors) return
-        styles.getAllSelectors(selectors).filter(sel => sel.startsWith('//')).forEach(sel => {
+        styles.getAllSelectors(selectors, { type: 'xpath' }).forEach(sel => {
             try {
                 const result = document.evaluate(sel, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
                 for (let i = 0 ; i < result.snapshotLength ; i++)

chatgpt-widescreen/firefox/extension/lib/styles.js

@@ -2,8 +2,13 @@
 
 window.styles = {
 
-    getAllSelectors(obj) { // used in this.tweaks.styles for spam selectors
-        return Object.values(obj).flatMap(val => typeof val == 'object' ? this.getAllSelectors(val) : val) },
+    getAllSelectors(obj, { type } = {}) { // used in this.tweaks.styles for spam selectors
+        const selectors = Object.values(obj).flatMap(val =>
+            typeof val == 'object' ? this.getAllSelectors(val, { type }) : val)
+        return type == 'css' ? selectors.filter(sel => !sel.startsWith('//'))
+             : type == 'xpath' ? selectors.filter(sel => sel.startsWith('//'))
+             : /* no type */ selectors
+    },
 
     get outerDivSelector() { // requires env.site
         return env.site == 'chatgpt' ? 'div.text-base > div'

chatgpt-widescreen/firefox/extension/lib/sync.js

@@ -62,7 +62,7 @@ window.sync = {
 
     spamBlock() { // requires env.site + sites
         const selectors = sites[env.site]?.selectors?.spam ; if (!selectors) return
-        styles.getAllSelectors(selectors).filter(sel => sel.startsWith('//')).forEach(sel => {
+        styles.getAllSelectors(selectors, { type: 'xpath' }).forEach(sel => {
             try {
                 const result = document.evaluate(sel, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null)
                 for (let i = 0 ; i < result.snapshotLength ; i++)