@duckduckgo/autoconsent 10.3.2 → 10.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v10.4.0 (Tue Mar 26 2024)
+
+#### 🚀 Enhancement
+
+- Check runcontext for prehide selectors. [#400](https://github.com/duckduckgo/autoconsent/pull/400) ([@sammacbeth](https://github.com/sammacbeth))
+- Fix rules for tumblr.com, onlyfans, canva.com, cookie-script [#395](https://github.com/duckduckgo/autoconsent/pull/395) ([@muodov](https://github.com/muodov))
+
+#### Authors: 2
+
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v10.3.2 (Wed Mar 20 2024)
 
 #### 🐛 Bug Fix

package/dist/addon-firefox/content.bundle.js

@@ -1212,7 +1212,7 @@
       this.ccpaNotice = false;
       this.ccpaPopup = false;
       this.runContext = {
-        main: false,
+        main: true,
         frame: true
       };
     }
@@ -1752,6 +1752,63 @@
     }
   };
 
+  // lib/cmps/tumblr-com.ts
+  var Tumblr = class extends AutoConsentCMPBase {
+    constructor() {
+      super(...arguments);
+      this.name = "tumblr-com";
+      this.runContext = {
+        "urlPattern": "^https://(www\\.)?tumblr\\.com/"
+      };
+    }
+    get hasSelfTest() {
+      return false;
+    }
+    get isIntermediate() {
+      return false;
+    }
+    get isCosmetic() {
+      return false;
+    }
+    get prehideSelectors() {
+      return ["#cmp-app-container"];
+    }
+    async detectCmp() {
+      return this.elementExists("#cmp-app-container");
+    }
+    async detectPopup() {
+      return this.elementVisible("#cmp-app-container", "any");
+    }
+    async optOut() {
+      let iframe = document.querySelector("#cmp-app-container iframe");
+      let settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+      if (!settingsButton) {
+        return false;
+      }
+      settingsButton.click();
+      await waitFor(() => {
+        const iframe2 = document.querySelector("#cmp-app-container iframe");
+        return !!iframe2.contentDocument?.querySelector(".cmp__dialog input");
+      }, 5, 500);
+      iframe = document.querySelector("#cmp-app-container iframe");
+      settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+      if (!settingsButton) {
+        return false;
+      }
+      settingsButton.click();
+      return true;
+    }
+    async optIn() {
+      const iframe = document.querySelector("#cmp-app-container iframe");
+      const acceptButton = iframe.contentDocument.querySelector(".cmp-components-button.is-primary");
+      if (acceptButton) {
+        acceptButton.click();
+        return true;
+      }
+      return false;
+    }
+  };
+
   // lib/cmps/all.ts
   var dynamicCMPs = [
     TrustArcTop,
@@ -1765,7 +1822,8 @@
     Uniconsent,
     Conversant,
     Tiktok,
-    Airbnb
+    Airbnb,
+    Tumblr
   ];
 
   // lib/dom-actions.ts
@@ -2240,12 +2298,7 @@
       const globalHidden = [
         "#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"
       ];
-      const selectors = this.rules.reduce((selectorList, rule) => {
-        if (rule.prehideSelectors) {
-          return [...selectorList, ...rule.prehideSelectors];
-        }
-        return selectorList;
-      }, globalHidden);
+      const selectors = this.rules.filter((rule) => rule.prehideSelectors && rule.checkRunContext()).reduce((selectorList, rule) => [...selectorList, ...rule.prehideSelectors], globalHidden);
       this.updateState({ prehideOn: true });
       setTimeout(() => {
         if (this.config.enablePrehide && this.state.prehideOn && !["runningOptOut", "runningOptIn"].includes(this.state.lifecycle)) {

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2024.3.15",
+  "version": "2024.3.20",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/rules.json

@@ -969,10 +969,13 @@
               "click": "div[role=\"dialog\"] button:nth-child(2)"
             },
             {
-              "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"privacy-policy\"]"
+              "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"cookie-policy\"]"
             },
             {
-              "click": "div[role=\"dialog\"] button:nth-child(2)"
+              "waitFor": "div[role=\"dialog\"] button[role=switch]"
+            },
+            {
+              "click": "div[role=\"dialog\"] button:nth-child(2):not([role])"
             },
             {
               "click": "div[role=\"dialog\"] div:last-child button:only-child"
@@ -1740,7 +1743,28 @@
       ],
       "optOut": [
         {
-          "click": "#cookiescript_reject"
+          "if": {
+            "exists": "#cookiescript_reject"
+          },
+          "then": [
+            {
+              "wait": 100
+            },
+            {
+              "click": "#cookiescript_reject"
+            }
+          ],
+          "else": [
+            {
+              "click": "#cookiescript_manage"
+            },
+            {
+              "waitForVisible": ".cookiescript_fsd_main"
+            },
+            {
+              "waitForThenClick": "#cookiescript_reject"
+            }
+          ]
         }
       ],
       "optIn": [
@@ -2110,7 +2134,7 @@
     {
       "name": "csu-landtag-de",
       "runContext": {
-        "urlPattern": "^https://(www|)?\\.csu-landtag\\.de"
+        "urlPattern": "^https://(www\\.|)?csu-landtag\\.de"
       },
       "prehideSelectors": [
         "#cookie-disclaimer"
@@ -4337,6 +4361,9 @@
     },
     {
       "name": "onlyFans.com",
+      "runContext": {
+        "urlPattern": "^https://onlyfans\\.com/"
+      },
       "prehideSelectors": [
         "div.b-cookies-informer"
       ],
@@ -4360,10 +4387,18 @@
           "click": "div.b-cookies-informer__nav > button:nth-child(1)"
         },
         {
-          "click": "div.b-cookies-informer__switchers > div:nth-child(2) > div[at-attr=\"checkbox\"] > span.b-input-radio__container > input[type=\"checkbox\"]"
-        },
-        {
-          "click": "div.b-cookies-informer__nav > button"
+          "if": {
+            "exists": "div.b-cookies-informer__switchers"
+          },
+          "then": [
+            {
+              "click": "div.b-cookies-informer__switchers input:not([disabled])",
+              "all": true
+            },
+            {
+              "click": "div.b-cookies-informer__nav > button"
+            }
+          ]
         }
       ]
     },
@@ -6106,33 +6141,6 @@
         }
       ]
     },
-    {
-      "name": "tumblr-com",
-      "cosmetic": true,
-      "prehideSelectors": [
-        "#cmp-app-container"
-      ],
-      "detectCmp": [
-        {
-          "exists": "#cmp-app-container"
-        }
-      ],
-      "detectPopup": [
-        {
-          "visible": "#cmp-app-container"
-        }
-      ],
-      "optIn": [
-        {
-          "click": "#tumblr #cmp-app-container div.components-modal__frame > iframe > html body > div > div > div.cmp__dialog-footer > div > button.components-button.white-space-normal.is-primary"
-        }
-      ],
-      "optOut": [
-        {
-          "hide": "#cmp-app-container"
-        }
-      ]
-    },
     {
       "name": "twitch-mobile",
       "vendorUrl": "https://m.twitch.tv/",

package/dist/addon-mv3/content.bundle.js

@@ -1212,7 +1212,7 @@
       this.ccpaNotice = false;
       this.ccpaPopup = false;
       this.runContext = {
-        main: false,
+        main: true,
         frame: true
       };
     }
@@ -1752,6 +1752,63 @@
     }
   };
 
+  // lib/cmps/tumblr-com.ts
+  var Tumblr = class extends AutoConsentCMPBase {
+    constructor() {
+      super(...arguments);
+      this.name = "tumblr-com";
+      this.runContext = {
+        "urlPattern": "^https://(www\\.)?tumblr\\.com/"
+      };
+    }
+    get hasSelfTest() {
+      return false;
+    }
+    get isIntermediate() {
+      return false;
+    }
+    get isCosmetic() {
+      return false;
+    }
+    get prehideSelectors() {
+      return ["#cmp-app-container"];
+    }
+    async detectCmp() {
+      return this.elementExists("#cmp-app-container");
+    }
+    async detectPopup() {
+      return this.elementVisible("#cmp-app-container", "any");
+    }
+    async optOut() {
+      let iframe = document.querySelector("#cmp-app-container iframe");
+      let settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+      if (!settingsButton) {
+        return false;
+      }
+      settingsButton.click();
+      await waitFor(() => {
+        const iframe2 = document.querySelector("#cmp-app-container iframe");
+        return !!iframe2.contentDocument?.querySelector(".cmp__dialog input");
+      }, 5, 500);
+      iframe = document.querySelector("#cmp-app-container iframe");
+      settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+      if (!settingsButton) {
+        return false;
+      }
+      settingsButton.click();
+      return true;
+    }
+    async optIn() {
+      const iframe = document.querySelector("#cmp-app-container iframe");
+      const acceptButton = iframe.contentDocument.querySelector(".cmp-components-button.is-primary");
+      if (acceptButton) {
+        acceptButton.click();
+        return true;
+      }
+      return false;
+    }
+  };
+
   // lib/cmps/all.ts
   var dynamicCMPs = [
     TrustArcTop,
@@ -1765,7 +1822,8 @@
     Uniconsent,
     Conversant,
     Tiktok,
-    Airbnb
+    Airbnb,
+    Tumblr
   ];
 
   // lib/dom-actions.ts
@@ -2240,12 +2298,7 @@
       const globalHidden = [
         "#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"
       ];
-      const selectors = this.rules.reduce((selectorList, rule) => {
-        if (rule.prehideSelectors) {
-          return [...selectorList, ...rule.prehideSelectors];
-        }
-        return selectorList;
-      }, globalHidden);
+      const selectors = this.rules.filter((rule) => rule.prehideSelectors && rule.checkRunContext()).reduce((selectorList, rule) => [...selectorList, ...rule.prehideSelectors], globalHidden);
       this.updateState({ prehideOn: true });
       setTimeout(() => {
         if (this.config.enablePrehide && this.state.prehideOn && !["runningOptOut", "runningOptIn"].includes(this.state.lifecycle)) {

package/dist/addon-mv3/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2024.3.15",
+  "version": "2024.3.20",
   "background": {
     "service_worker": "background.bundle.js"
   },

package/dist/addon-mv3/rules.json

@@ -969,10 +969,13 @@
               "click": "div[role=\"dialog\"] button:nth-child(2)"
             },
             {
-              "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"privacy-policy\"]"
+              "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"cookie-policy\"]"
             },
             {
-              "click": "div[role=\"dialog\"] button:nth-child(2)"
+              "waitFor": "div[role=\"dialog\"] button[role=switch]"
+            },
+            {
+              "click": "div[role=\"dialog\"] button:nth-child(2):not([role])"
             },
             {
               "click": "div[role=\"dialog\"] div:last-child button:only-child"
@@ -1740,7 +1743,28 @@
       ],
       "optOut": [
         {
-          "click": "#cookiescript_reject"
+          "if": {
+            "exists": "#cookiescript_reject"
+          },
+          "then": [
+            {
+              "wait": 100
+            },
+            {
+              "click": "#cookiescript_reject"
+            }
+          ],
+          "else": [
+            {
+              "click": "#cookiescript_manage"
+            },
+            {
+              "waitForVisible": ".cookiescript_fsd_main"
+            },
+            {
+              "waitForThenClick": "#cookiescript_reject"
+            }
+          ]
         }
       ],
       "optIn": [
@@ -2110,7 +2134,7 @@
     {
       "name": "csu-landtag-de",
       "runContext": {
-        "urlPattern": "^https://(www|)?\\.csu-landtag\\.de"
+        "urlPattern": "^https://(www\\.|)?csu-landtag\\.de"
       },
       "prehideSelectors": [
         "#cookie-disclaimer"
@@ -4337,6 +4361,9 @@
     },
     {
       "name": "onlyFans.com",
+      "runContext": {
+        "urlPattern": "^https://onlyfans\\.com/"
+      },
       "prehideSelectors": [
         "div.b-cookies-informer"
       ],
@@ -4360,10 +4387,18 @@
           "click": "div.b-cookies-informer__nav > button:nth-child(1)"
         },
         {
-          "click": "div.b-cookies-informer__switchers > div:nth-child(2) > div[at-attr=\"checkbox\"] > span.b-input-radio__container > input[type=\"checkbox\"]"
-        },
-        {
-          "click": "div.b-cookies-informer__nav > button"
+          "if": {
+            "exists": "div.b-cookies-informer__switchers"
+          },
+          "then": [
+            {
+              "click": "div.b-cookies-informer__switchers input:not([disabled])",
+              "all": true
+            },
+            {
+              "click": "div.b-cookies-informer__nav > button"
+            }
+          ]
         }
       ]
     },
@@ -6106,33 +6141,6 @@
         }
       ]
     },
-    {
-      "name": "tumblr-com",
-      "cosmetic": true,
-      "prehideSelectors": [
-        "#cmp-app-container"
-      ],
-      "detectCmp": [
-        {
-          "exists": "#cmp-app-container"
-        }
-      ],
-      "detectPopup": [
-        {
-          "visible": "#cmp-app-container"
-        }
-      ],
-      "optIn": [
-        {
-          "click": "#tumblr #cmp-app-container div.components-modal__frame > iframe > html body > div > div > div.cmp__dialog-footer > div > button.components-button.white-space-normal.is-primary"
-        }
-      ],
-      "optOut": [
-        {
-          "hide": "#cmp-app-container"
-        }
-      ]
-    },
     {
       "name": "twitch-mobile",
       "vendorUrl": "https://m.twitch.tv/",

package/dist/autoconsent.cjs.js

@@ -1235,7 +1235,7 @@ var SourcePoint = class extends AutoConsentCMPBase {
     this.ccpaNotice = false;
     this.ccpaPopup = false;
     this.runContext = {
-      main: false,
+      main: true,
       frame: true
     };
   }
@@ -1775,6 +1775,63 @@ var Airbnb = class extends AutoConsentCMPBase {
   }
 };
 
+// lib/cmps/tumblr-com.ts
+var Tumblr = class extends AutoConsentCMPBase {
+  constructor() {
+    super(...arguments);
+    this.name = "tumblr-com";
+    this.runContext = {
+      "urlPattern": "^https://(www\\.)?tumblr\\.com/"
+    };
+  }
+  get hasSelfTest() {
+    return false;
+  }
+  get isIntermediate() {
+    return false;
+  }
+  get isCosmetic() {
+    return false;
+  }
+  get prehideSelectors() {
+    return ["#cmp-app-container"];
+  }
+  async detectCmp() {
+    return this.elementExists("#cmp-app-container");
+  }
+  async detectPopup() {
+    return this.elementVisible("#cmp-app-container", "any");
+  }
+  async optOut() {
+    let iframe = document.querySelector("#cmp-app-container iframe");
+    let settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+    if (!settingsButton) {
+      return false;
+    }
+    settingsButton.click();
+    await waitFor(() => {
+      const iframe2 = document.querySelector("#cmp-app-container iframe");
+      return !!iframe2.contentDocument?.querySelector(".cmp__dialog input");
+    }, 5, 500);
+    iframe = document.querySelector("#cmp-app-container iframe");
+    settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+    if (!settingsButton) {
+      return false;
+    }
+    settingsButton.click();
+    return true;
+  }
+  async optIn() {
+    const iframe = document.querySelector("#cmp-app-container iframe");
+    const acceptButton = iframe.contentDocument.querySelector(".cmp-components-button.is-primary");
+    if (acceptButton) {
+      acceptButton.click();
+      return true;
+    }
+    return false;
+  }
+};
+
 // lib/cmps/all.ts
 var dynamicCMPs = [
   TrustArcTop,
@@ -1788,7 +1845,8 @@ var dynamicCMPs = [
   Uniconsent,
   Conversant,
   Tiktok,
-  Airbnb
+  Airbnb,
+  Tumblr
 ];
 
 // lib/dom-actions.ts
@@ -2263,12 +2321,7 @@ var AutoConsent = class {
     const globalHidden = [
       "#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"
     ];
-    const selectors = this.rules.reduce((selectorList, rule) => {
-      if (rule.prehideSelectors) {
-        return [...selectorList, ...rule.prehideSelectors];
-      }
-      return selectorList;
-    }, globalHidden);
+    const selectors = this.rules.filter((rule) => rule.prehideSelectors && rule.checkRunContext()).reduce((selectorList, rule) => [...selectorList, ...rule.prehideSelectors], globalHidden);
     this.updateState({ prehideOn: true });
     setTimeout(() => {
       if (this.config.enablePrehide && this.state.prehideOn && !["runningOptOut", "runningOptIn"].includes(this.state.lifecycle)) {

package/dist/autoconsent.esm.js

@@ -1210,7 +1210,7 @@ var SourcePoint = class extends AutoConsentCMPBase {
     this.ccpaNotice = false;
     this.ccpaPopup = false;
     this.runContext = {
-      main: false,
+      main: true,
       frame: true
     };
   }
@@ -1750,6 +1750,63 @@ var Airbnb = class extends AutoConsentCMPBase {
   }
 };
 
+// lib/cmps/tumblr-com.ts
+var Tumblr = class extends AutoConsentCMPBase {
+  constructor() {
+    super(...arguments);
+    this.name = "tumblr-com";
+    this.runContext = {
+      "urlPattern": "^https://(www\\.)?tumblr\\.com/"
+    };
+  }
+  get hasSelfTest() {
+    return false;
+  }
+  get isIntermediate() {
+    return false;
+  }
+  get isCosmetic() {
+    return false;
+  }
+  get prehideSelectors() {
+    return ["#cmp-app-container"];
+  }
+  async detectCmp() {
+    return this.elementExists("#cmp-app-container");
+  }
+  async detectPopup() {
+    return this.elementVisible("#cmp-app-container", "any");
+  }
+  async optOut() {
+    let iframe = document.querySelector("#cmp-app-container iframe");
+    let settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+    if (!settingsButton) {
+      return false;
+    }
+    settingsButton.click();
+    await waitFor(() => {
+      const iframe2 = document.querySelector("#cmp-app-container iframe");
+      return !!iframe2.contentDocument?.querySelector(".cmp__dialog input");
+    }, 5, 500);
+    iframe = document.querySelector("#cmp-app-container iframe");
+    settingsButton = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+    if (!settingsButton) {
+      return false;
+    }
+    settingsButton.click();
+    return true;
+  }
+  async optIn() {
+    const iframe = document.querySelector("#cmp-app-container iframe");
+    const acceptButton = iframe.contentDocument.querySelector(".cmp-components-button.is-primary");
+    if (acceptButton) {
+      acceptButton.click();
+      return true;
+    }
+    return false;
+  }
+};
+
 // lib/cmps/all.ts
 var dynamicCMPs = [
   TrustArcTop,
@@ -1763,7 +1820,8 @@ var dynamicCMPs = [
   Uniconsent,
   Conversant,
   Tiktok,
-  Airbnb
+  Airbnb,
+  Tumblr
 ];
 
 // lib/dom-actions.ts
@@ -2238,12 +2296,7 @@ var AutoConsent = class {
     const globalHidden = [
       "#didomi-popup,.didomi-popup-container,.didomi-popup-notice,.didomi-consent-popup-preferences,#didomi-notice,.didomi-popup-backdrop,.didomi-screen-medium"
     ];
-    const selectors = this.rules.reduce((selectorList, rule) => {
-      if (rule.prehideSelectors) {
-        return [...selectorList, ...rule.prehideSelectors];
-      }
-      return selectorList;
-    }, globalHidden);
+    const selectors = this.rules.filter((rule) => rule.prehideSelectors && rule.checkRunContext()).reduce((selectorList, rule) => [...selectorList, ...rule.prehideSelectors], globalHidden);
     this.updateState({ prehideOn: true });
     setTimeout(() => {
       if (this.config.enablePrehide && this.state.prehideOn && !["runningOptOut", "runningOptIn"].includes(this.state.lifecycle)) {