@duckduckgo/autoconsent 10.3.1 → 10.4.0

package/dist/autoconsent.unit.js

@@ -1217,7 +1217,7 @@
       this.ccpaNotice = false;
       this.ccpaPopup = false;
       this.runContext = {
-        main: false,
+        main: true,
         frame: true
       };
     }
@@ -1757,6 +1757,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,
@@ -1770,7 +1827,8 @@
     Uniconsent,
     Conversant,
     Tiktok,
-    Airbnb
+    Airbnb,
+    Tumblr
   ];
 
   // lib/dom-actions.ts
@@ -2245,12 +2303,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)) {
@@ -3276,10 +3329,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'
@@ -4047,7 +4103,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: [
@@ -4417,7 +4494,7 @@
     {
       name: "csu-landtag-de",
       runContext: {
-        urlPattern: "^https://(www|)?\\.csu-landtag\\.de"
+        urlPattern: "^https://(www\\.|)?csu-landtag\\.de"
       },
       prehideSelectors: [
         "#cookie-disclaimer"
@@ -6644,6 +6721,9 @@
     },
     {
       name: "onlyFans.com",
+      runContext: {
+        urlPattern: "^https://onlyfans\\.com/"
+      },
       prehideSelectors: [
         "div.b-cookies-informer"
       ],
@@ -6667,10 +6747,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"
+            }
+          ]
         }
       ]
     },
@@ -7604,33 +7692,32 @@
     {
       name: "strato.de",
       prehideSelectors: [
-        "#cookie_initial_modal",
-        ".modal-backdrop"
+        ".consent__wrapper"
       ],
       runContext: {
         urlPattern: "^https://www\\.strato\\.de/"
       },
       detectCmp: [
         {
-          exists: "#cookie_initial_modal"
+          exists: ".consent"
         }
       ],
       detectPopup: [
         {
-          visible: "#cookie_initial_modal"
+          visible: ".consent"
         }
       ],
       optIn: [
         {
-          click: "button#jss_consent_all_initial_modal"
+          click: "button.consentAgree"
         }
       ],
       optOut: [
         {
-          click: "button#jss_open_settings_modal"
+          click: "button.consentSettings"
         },
         {
-          click: "button#jss_consent_checked"
+          waitForThenClick: "button#consentSubmit"
         }
       ]
     },
@@ -8414,33 +8501,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/lib/cmps/all.ts

@@ -10,7 +10,7 @@ import Uniconsent from './uniconsent';
 import Conversant from './conversant';
 import Tiktok from './tiktok';
 import Airbnb from './airbnb';
-
+import Tumblr from './tumblr-com';
 
 export const dynamicCMPs = [
   TrustArcTop,
@@ -25,4 +25,5 @@ export const dynamicCMPs = [
   Conversant,
   Tiktok,
   Airbnb,
+  Tumblr,
 ];

package/lib/cmps/sourcepoint-frame.ts

@@ -10,7 +10,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
   ccpaPopup = false;
 
   runContext: RunContext = {
-    main: false,
+    main: true,
     frame: true,
   }
 

package/lib/cmps/tumblr-com.ts

@@ -0,0 +1,65 @@
+import { waitFor } from "../utils";
+import AutoConsentCMPBase from "./base";
+
+export default class Tumblr extends AutoConsentCMPBase {
+  name = "tumblr-com";
+  runContext = {
+    "urlPattern": "^https://(www\\.)?tumblr\\.com/"
+  }
+
+  get hasSelfTest(): boolean {
+    return false;
+  }
+
+  get isIntermediate(): boolean {
+    return false;
+  }
+
+  get isCosmetic(): boolean {
+    return false;
+  }
+
+  get prehideSelectors(): string[] {
+    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: HTMLIFrameElement = document.querySelector('#cmp-app-container iframe');
+    let settingsButton: HTMLButtonElement = iframe.contentDocument?.querySelector(".cmp-components-button.is-secondary");
+    if (!settingsButton) {
+      return false;
+    }
+    settingsButton.click();
+    await waitFor(() => {
+      const iframe: HTMLIFrameElement = document.querySelector('#cmp-app-container iframe');
+      return !!iframe.contentDocument?.querySelector(".cmp__dialog input");
+    }, 5, 500);
+
+    // it's a different button now
+    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: HTMLIFrameElement = document.querySelector('#cmp-app-container iframe');
+    const acceptButton: HTMLButtonElement = iframe.contentDocument.querySelector(".cmp-components-button.is-primary");
+    if (acceptButton) {
+      acceptButton.click();
+      return true;
+    }
+    return false;
+  }
+}

package/lib/web.ts

@@ -411,12 +411,10 @@ export default class AutoConsent {
       "#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(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "10.3.1",
+  "version": "10.4.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",

package/rules/autoconsent/canva.json

@@ -12,8 +12,9 @@
       "then": [{ "click": "div[role=\"dialog\"] button:nth-child(2)" }],
       "else": [
         { "click": "div[role=\"dialog\"] button:nth-child(2)" },
-        { "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"privacy-policy\"]" },
-        { "click": "div[role=\"dialog\"] button:nth-child(2)" },
+        { "waitFor": "div[role=\"dialog\"] a[data-anchor-id=\"cookie-policy\"]" },
+        { "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" }
       ]
     }   

package/rules/autoconsent/cookie-script.json

@@ -4,6 +4,19 @@
     "prehideSelectors": ["#cookiescript_injected"],
     "detectCmp": [{"exists": "#cookiescript_injected"}],
     "detectPopup": [{"visible": "#cookiescript_injected"}],
-    "optOut": [{"click": "#cookiescript_reject"}],
+    "optOut": [
+        {
+            "if": { "exists": "#cookiescript_reject" },
+            "then": [
+                { "wait": 100 },
+                {"click": "#cookiescript_reject" }
+            ],
+            "else": [
+                { "click": "#cookiescript_manage" },
+                { "waitForVisible": ".cookiescript_fsd_main" },
+                { "waitForThenClick": "#cookiescript_reject" }
+            ]
+        }
+    ],
     "optIn": [{"click": "#cookiescript_accept"}]
 }

package/rules/autoconsent/csu-landtag-de.json

@@ -1,7 +1,7 @@
 {
     "name": "csu-landtag-de",
     "runContext": {
-        "urlPattern": "^https://(www|)?\\.csu-landtag\\.de"
+        "urlPattern": "^https://(www\\.|)?csu-landtag\\.de"
     },
     "prehideSelectors": ["#cookie-disclaimer"],
     "detectCmp": [

package/rules/autoconsent/onlyFans.json

@@ -1,5 +1,8 @@
 {
   "name": "onlyFans.com",
+  "runContext": {
+    "urlPattern": "^https://onlyfans\\.com/"
+  },
   "prehideSelectors": ["div.b-cookies-informer"],
   "detectCmp": [{ "exists": "div.b-cookies-informer" }],
   "detectPopup": [{ "exists": "div.b-cookies-informer" }],
@@ -11,8 +14,14 @@
       "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"}
+      ]
+    }
   ]
 }

package/rules/autoconsent/strato-de.json

@@ -1,20 +1,20 @@
 {
     "name": "strato.de",
-    "prehideSelectors": ["#cookie_initial_modal", ".modal-backdrop"],
+    "prehideSelectors": [".consent__wrapper"],
     "runContext": {
         "urlPattern": "^https://www\\.strato\\.de/"
     },
-    "detectCmp": [{ "exists": "#cookie_initial_modal" }],
-    "detectPopup": [{ "visible": "#cookie_initial_modal" }],
+    "detectCmp": [{ "exists": ".consent" }],
+    "detectPopup": [{ "visible": ".consent" }],
     "optIn": [{
-        "click": "button#jss_consent_all_initial_modal"
+        "click": "button.consentAgree"
     }],
     "optOut": [
         {
-            "click": "button#jss_open_settings_modal"
+            "click": "button.consentSettings"
         },
         {
-            "click": "button#jss_consent_checked"
+            "waitForThenClick": "button#consentSubmit"
         }
     ]
 }

package/rules/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"
+            }
+          ]
         }
       ]
     },
@@ -5297,33 +5332,32 @@
     {
       "name": "strato.de",
       "prehideSelectors": [
-        "#cookie_initial_modal",
-        ".modal-backdrop"
+        ".consent__wrapper"
       ],
       "runContext": {
         "urlPattern": "^https://www\\.strato\\.de/"
       },
       "detectCmp": [
         {
-          "exists": "#cookie_initial_modal"
+          "exists": ".consent"
         }
       ],
       "detectPopup": [
         {
-          "visible": "#cookie_initial_modal"
+          "visible": ".consent"
         }
       ],
       "optIn": [
         {
-          "click": "button#jss_consent_all_initial_modal"
+          "click": "button.consentAgree"
         }
       ],
       "optOut": [
         {
-          "click": "button#jss_open_settings_modal"
+          "click": "button.consentSettings"
         },
         {
-          "click": "button#jss_consent_checked"
+          "waitForThenClick": "button#consentSubmit"
         }
       ]
     },
@@ -6107,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/rules/autoconsent/tumblr-com.json

@@ -1,10 +0,0 @@
-{
-  "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" }]
-}