@duckduckgo/autoconsent 16.26.0 → 16.28.0

package/dist/types/cmps/base.d.ts

@@ -32,6 +32,7 @@ export default class AutoConsentCMPBase implements AutoCMP, DomActionsProvider {
     waitForThenClick(selector: ElementSelector, timeout?: number, all?: boolean): Promise<boolean>;
     wait(ms: number): Promise<true>;
     hide(selector: string, method?: HideMethod): boolean;
+    stylesheet(cssRule: string, stylesheetId?: string): boolean;
     removeClass(selector: ElementSelector, className: string): boolean;
     setStyle(selector: ElementSelector, css: string): boolean;
     addStyle(selector: ElementSelector, css: string): boolean;

package/dist/types/dom-actions.d.ts

@@ -14,6 +14,7 @@ export declare class DomActions implements DomActionsProvider {
     wait(ms: number): Promise<true>;
     cookieContains(substring: string): boolean;
     hide(selector: string, method?: HideMethod): boolean;
+    stylesheet(cssRule: string, stylesheetId?: string): boolean;
     removeClass(selector: ElementSelector, className: string): boolean;
     setStyle(selector: ElementSelector, css: string): boolean;
     addStyle(selector: ElementSelector, css: string): boolean;

package/dist/types/rules.d.ts

@@ -1,5 +1,5 @@
 import { snippets } from './eval-snippets';
-export declare const SUPPORTED_RULE_STEP_VERSION = 2;
+export declare const SUPPORTED_RULE_STEP_VERSION = 3;
 export type AutoConsentCMPRule = {
     readonly name: string;
     /**
@@ -33,7 +33,7 @@ export type ElementSelector = string | string[];
 export type AutoConsentRuleStep = {
     optional?: boolean;
     comment?: string;
-} & Partial<ElementExistsRule> & Partial<ElementVisibleRule> & Partial<EvalRule> & Partial<WaitForRule> & Partial<WaitForVisibleRule> & Partial<ClickRule> & Partial<WaitForThenClickRule> & Partial<WaitRule> & Partial<HideRule> & Partial<IfRule> & Partial<AnyRule> & Partial<NegatedRule> & Partial<CookieContainsRule> & Partial<RemoveClassRule> & Partial<SetStyleRule> & Partial<AddStyleRule>;
+} & Partial<ElementExistsRule> & Partial<ElementVisibleRule> & Partial<EvalRule> & Partial<WaitForRule> & Partial<WaitForVisibleRule> & Partial<ClickRule> & Partial<WaitForThenClickRule> & Partial<WaitRule> & Partial<HideRule> & Partial<IfRule> & Partial<AnyRule> & Partial<NegatedRule> & Partial<CookieContainsRule> & Partial<RemoveClassRule> & Partial<SetStyleRule> & Partial<AddStyleRule> & Partial<StylesheetRule>;
 export type NegatedRule = {
     negated: boolean;
 };
@@ -97,3 +97,7 @@ export type AddStyleRule = {
     addStyle: string;
     selector: ElementSelector;
 };
+export type StylesheetRule = {
+    stylesheet: string;
+    stylesheetId?: string;
+};

package/dist/types/utils.d.ts

@@ -3,6 +3,7 @@ import { Config } from './types';
 export declare function getStyleElement(styleOverrideElementId?: string): HTMLStyleElement;
 export declare function getHidingStyle(method: HideMethod): string;
 export declare function hideElements(styleEl: HTMLStyleElement, selector: string, method?: HideMethod): boolean;
+export declare function appendStylesheetRule(styleEl: HTMLStyleElement, cssRule: string, marker?: string): boolean;
 export declare function waitFor(predicate: () => Promise<boolean> | boolean, maxTimes: number, interval: number): Promise<boolean>;
 export declare function isElementVisible(elem: HTMLElement): boolean;
 export declare function copyObject(data: any): any;

package/docs/rule-syntax.md

@@ -154,6 +154,18 @@ Set the inline style of the elements matched by the `selector`. `style-string` i
 ```
 Append the inline style of the elements matched by the `selector`. `style-string` is a string of CSS properties and values. The style is appended to the existing inline style, separated by a semicolon.
 
+## Stylesheet
+
+```javascript
+{
+  "stylesheet": "css-rule-string",
+  "stylesheetId": "unique-marker"
+}
+```
+Append a CSS rule (e.g. `".overlay { display: none !important; }"`) to the style element injected by autoconsent. Unlike `setStyle`/`addStyle`, which modify inline styles of currently matched elements, an appended stylesheet rule keeps applying to elements matched later — useful when the page re-adds classes or inline styles after the opt-out (e.g. scroll locks reapplied on back/forward navigation).
+
+The optional `stylesheetId` is a marker used to prevent duplicate inserts when the rule runs multiple times; if omitted, the CSS rule text itself is used for deduplication.
+
 ## Cookie match
 ```javascript
 {
@@ -241,11 +253,13 @@ The `minimumRuleStepVersion` field solves this: clients compare the rule's decla
 |---------|-----------------|
 | 1 | All original step types (`exists`, `visible`, `waitFor`, `waitForVisible`, `click`, `waitForThenClick`, `wait`, `hide`, `if`/`then`/`else`, `any`, `eval`, `cookieContains`, `negated`) |
 | 2 | `removeClass`, `setStyle`, `addStyle` |
+| 3 | `stylesheet` |
 
 ### When to set it
 
 - If a rule only uses version-1 step types, omit the field (defaults to `1`).
 - If a rule uses `removeClass`, `setStyle`, or `addStyle`, set `"minimumRuleStepVersion": 2`.
+- If a rule uses `stylesheet`, set `"minimumRuleStepVersion": 3`.
 - When a future version introduces new step types, any rule using them must set `minimumRuleStepVersion` to the corresponding version number.
 
 ### Adding new step types

package/lib/cmps/base.ts

@@ -196,6 +196,10 @@ export default class AutoConsentCMPBase implements AutoCMP, DomActionsProvider {
         return this.autoconsent.domActions.hide(selector, method);
     }
 
+    stylesheet(cssRule: string, stylesheetId?: string) {
+        return this.autoconsent.domActions.stylesheet(cssRule, stylesheetId);
+    }
+
     removeClass(selector: ElementSelector, className: string) {
         return this.autoconsent.domActions.removeClass(selector, className);
     }
@@ -340,6 +344,9 @@ export class AutoConsentCMP extends AutoConsentCMPBase {
         if (rule.hide) {
             results.push(this.hide(rule.hide, rule.method));
         }
+        if (rule.stylesheet !== undefined) {
+            results.push(this.stylesheet(rule.stylesheet, rule.stylesheetId));
+        }
         if (rule.removeClass !== undefined) {
             results.push(rule.selector ? this.removeClass(rule.selector, rule.removeClass) : false);
         }

package/lib/dom-actions.ts

@@ -1,6 +1,6 @@
 import { ElementSelector, HideMethod, VisibilityCheck } from './rules';
 import { DomActionsProvider } from './types';
-import { getStyleElement, hideElements, isElementVisible, waitFor } from './utils';
+import { getStyleElement, hideElements, appendStylesheetRule, isElementVisible, waitFor } from './utils';
 import AutoConsent from './web';
 
 export class DomActions implements DomActionsProvider {
@@ -91,6 +91,12 @@ export class DomActions implements DomActionsProvider {
         return hideElements(styleEl, selector, method);
     }
 
+    stylesheet(cssRule: string, stylesheetId?: string): boolean {
+        this.autoconsentInstance.config.logs.rulesteps && console.log('[stylesheet]', cssRule, stylesheetId);
+        const styleEl = getStyleElement();
+        return appendStylesheetRule(styleEl, cssRule, stylesheetId);
+    }
+
     removeClass(selector: ElementSelector, className: string): boolean {
         const elements = this.elementSelector(selector);
         this.autoconsentInstance.config.logs.rulesteps && console.log('[removeClass]', selector, className, elements);

package/lib/heuristic-patterns.ts

@@ -163,8 +163,8 @@ const REJECT_PATTERNS_ENGLISH = [
     // note that "reject and subscribe" and "reject and pay" are excluded via BUTTON_NEVER_MATCH_PATTERNS
     /^\s*(no,?\s*)?(i\s+)?(reject|deny|refuse|decline|disable)\s*(all)?\s*(but|except)?\s*(non[- ]?essential|un(necessary|required)|optional|additional|targeting|analytics|marketing|non[- ]?necessary|extra|tracking|advertising|necessary|essential)?\s*(cookies)?\s*(and\s+close)?\s*$/is,
 
-    // e.g. "i do not accept", "do not accept cookies"
-    /^\s*(i\s+)?do\s+not\s+accept\s*(cookies)?\s*$/is,
+    // e.g. "i do not accept", "do not accept cookies", "i do not accept the use of cookies"
+    /^\s*(no,?\s*)?(i\s+)?do\s+not\s+accept\s*(the\s+use\s+of\s+)?(any\s+)?(cookies)?\s*$/is,
 
     // e.g. "continue without accepting", "continue without agreeing", "continue without agreeing →"
     /^\s*(continue|proceed|continue\s+browsing)\s+without\s+(accepting|agreeing|consent|cookies|tracking)(\s*→)?\s*$/is,

package/lib/rules.ts

@@ -2,7 +2,8 @@ import { snippets } from './eval-snippets';
 
 // 1 - the first version of the rule step format
 // 2 - added removeClass, setStyle, addStyle
-export const SUPPORTED_RULE_STEP_VERSION = 2;
+// 3 - added stylesheet
+export const SUPPORTED_RULE_STEP_VERSION = 3;
 
 export type AutoConsentCMPRule = {
     readonly name: string;
@@ -52,7 +53,8 @@ export type AutoConsentRuleStep = { optional?: boolean; comment?: string } & Par
     Partial<CookieContainsRule> &
     Partial<RemoveClassRule> &
     Partial<SetStyleRule> &
-    Partial<AddStyleRule>;
+    Partial<AddStyleRule> &
+    Partial<StylesheetRule>;
 
 export type NegatedRule = {
     negated: boolean;
@@ -134,3 +136,8 @@ export type AddStyleRule = {
     addStyle: string;
     selector: ElementSelector;
 };
+
+export type StylesheetRule = {
+    stylesheet: string;
+    stylesheetId?: string;
+};

package/lib/utils.ts

@@ -32,6 +32,22 @@ export function hideElements(styleEl: HTMLStyleElement, selector: string, method
     return false;
 }
 
+// append a stylesheet rule once; marker is used to avoid duplicate inserts on re-runs
+export function appendStylesheetRule(styleEl: HTMLStyleElement, cssRule: string, marker?: string): boolean {
+    if (!(styleEl instanceof HTMLStyleElement) || cssRule.length === 0) {
+        return false;
+    }
+    const markerComment = marker ? `/* autoconsent:${marker} */` : '';
+    if (markerComment && styleEl.innerText.includes(markerComment)) {
+        return true;
+    }
+    if (!markerComment && styleEl.innerText.includes(cssRule.trim())) {
+        return true;
+    }
+    styleEl.innerText += `${markerComment}${markerComment ? ' ' : ''}${cssRule} `;
+    return true;
+}
+
 export async function waitFor(predicate: () => Promise<boolean> | boolean, maxTimes: number, interval: number): Promise<boolean> {
     const result = await predicate();
     if (!result && maxTimes > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "16.26.0",
+  "version": "16.28.0",
   "description": "",
   "types": "./dist/types/web.d.ts",
   "exports": {

package/rules/autoconsent/amazon-pay.json

@@ -0,0 +1,13 @@
+{
+    "name": "amazon-pay",
+    "vendorUrl": "https://pay.amazon.com/",
+    "runContext": {
+        "urlPattern": "^https?://pay\\.amazon\\."
+    },
+    "prehideSelectors": [".cookie-menu.js-cookie-banner"],
+    "detectCmp": [{ "exists": ".cookie-menu.js-cookie-banner .js-cookie-banner-close" }],
+    "detectPopup": [{ "visible": ".cookie-menu.js-cookie-banner" }],
+    "optIn": [{ "click": ".cookie-menu.js-cookie-banner .js-cookie-banner-close" }],
+    "optOut": [{ "click": ".cookie-menu.js-cookie-banner .js-cookie-banner-close" }],
+    "test": [{ "cookieContains": "apaycnst-mktg=true" }]
+}

package/rules/autoconsent/bbva.json

@@ -0,0 +1,12 @@
+{
+    "name": "bbva",
+    "prehideSelectors": [".cookiesgdpr__base:has(.cookiesgdpr__rejectbtn)"],
+    "detectCmp": [{ "exists": ".cookiesgdpr__base .cookiesgdpr__rejectbtn" }],
+    "detectPopup": [{ "visible": ".cookiesgdpr__base .cookiesgdpr__rejectbtn" }],
+    "optIn": [{ "waitForThenClick": ".cookiesgdpr__base .cookiesgdpr__acceptbtn" }],
+    "optOut": [
+        { "waitForThenClick": ".cookiesgdpr__base .cookiesgdpr__rejectbtn" },
+        { "waitForVisible": ".cookiesgdpr__base .cookiesgdpr__wrapper", "check": "none" }
+    ],
+    "test": [{ "cookieContains": "\"analitica\":false" }]
+}

package/rules/autoconsent/complianz-opt-out.json

@@ -26,6 +26,12 @@
         }
     ],
     "optOut": [
+        {
+            "comment": "the popup markup exists before the library opens it; clicking too early gets undone by the pending open",
+            "waitFor": "[aria-describedby=\"cookieconsent:desc\"].cc-type-opt-out:not(.cc-invisible)",
+            "timeout": 2000,
+            "optional": true
+        },
         {
             "if": {
                 "exists": ".cc-deny"

package/rules/autoconsent/deliveroo.json

@@ -0,0 +1,15 @@
+{
+    "name": "deliveroo",
+    "runContext": {
+        "urlPattern": "^https?://(\\w+\\.)?deliveroo\\.(co\\.uk|\\w+)/"
+    },
+    "prehideSelectors": ["div[role=\"dialog\"][class*=\"CustomCookieBanner\"]"],
+    "detectCmp": [{ "exists": "div[role=\"dialog\"][class*=\"CustomCookieBanner\"]" }],
+    "detectPopup": [{ "visible": "div[role=\"dialog\"][class*=\"CustomCookieBanner\"]" }],
+    "optIn": [{ "waitForThenClick": "#onetrust-consent-sdk #accept-recommended-btn-handler" }],
+    "optOut": [
+        { "waitForThenClick": "#onetrust-consent-sdk .ot-pc-refuse-all-handler" },
+        { "waitForVisible": "div[role=\"dialog\"][class*=\"CustomCookieBanner\"]", "check": "none" }
+    ],
+    "test": [{ "cookieContains": "OptanonAlertBoxClosed" }]
+}

package/rules/autoconsent/ebay.json

@@ -21,11 +21,45 @@
     "optIn": [
         {
             "waitForThenClick": "#gdpr-banner-accept"
+        },
+        {
+            "waitForVisible": "#gdpr-banner",
+            "check": "none",
+            "timeout": 2000,
+            "optional": true
+        },
+        {
+            "if": {
+                "visible": "#gdpr-banner"
+            },
+            "then": [
+                {
+                    "waitForThenClick": "#gdpr-banner-accept",
+                    "timeout": 2000
+                }
+            ]
         }
     ],
     "optOut": [
         {
             "waitForThenClick": "#gdpr-banner-decline"
+        },
+        {
+            "waitForVisible": "#gdpr-banner",
+            "check": "none",
+            "timeout": 2000,
+            "optional": true
+        },
+        {
+            "if": {
+                "visible": "#gdpr-banner"
+            },
+            "then": [
+                {
+                    "waitForThenClick": "#gdpr-banner-decline",
+                    "timeout": 2000
+                }
+            ]
         }
     ]
 }

package/rules/autoconsent/gemini-google-com.json

@@ -0,0 +1,9 @@
+{
+    "name": "gemini.google.com",
+    "prehideSelectors": ["[data-test-id=\"cookie-banner-body\"]"],
+    "detectCmp": [{ "exists": "cookie-banner [data-test-id=\"cookie-banner-body\"] [data-test-id=\"reject-button\"]" }],
+    "detectPopup": [{ "visible": "[data-test-id=\"cookie-banner-body\"]" }],
+    "optIn": [{ "waitForThenClick": "[data-test-id=\"cookie-banner-body\"] [data-test-id=\"accept-button\"]" }],
+    "optOut": [{ "waitForThenClick": "[data-test-id=\"cookie-banner-body\"] [data-test-id=\"reject-button\"]" }],
+    "test": []
+}

package/rules/autoconsent/justwatch-com.json

@@ -7,7 +7,7 @@
     "optOut": [
         { "click": ".consent-banner__actions button.basic-button.secondary" },
         { "waitForThenClick": ".consent-modal__footer button.basic-button.secondary" },
-        { "waitForThenClick": ".consent-modal ion-content > div > a:nth-child(9)" },
+        { "waitForThenClick": ".consent-modal .base-modal__body a", "all": true },
         { "click": "label.consent-switch input[type=checkbox]:checked", "all": true, "optional": true },
         { "waitForVisible": ".consent-modal__footer button.basic-button.primary" },
         { "click": ".consent-modal__footer button.basic-button.primary" }

package/rules/autoconsent/kingrecords-co-jp.json

@@ -0,0 +1,21 @@
+{
+    "name": "kingrecords-co-jp",
+    "vendorUrl": "https://www.kingrecords.co.jp/",
+    "runContext": {
+        "urlPattern": "^https?://(?:[^/]+\\.)?kingrecords\\.co\\.jp/"
+    },
+    "prehideSelectors": [".cookie:has(.cookie__inner .cookie__button)"],
+    "detectCmp": [{ "exists": ".cookie > .cookie__inner > .cookie__button > a" }],
+    "detectPopup": [{ "visible": ".cookie > .cookie__inner > .cookie__button > a" }],
+    "optIn": [
+        { "waitFor": "#loader.is--show", "timeout": 10000, "optional": true },
+        { "waitForThenClick": ".cookie > .cookie__inner > .cookie__button > a" }
+    ],
+    "optOut": [
+        { "waitFor": "#loader.is--show", "timeout": 10000, "optional": true },
+        { "waitForThenClick": ".cookie > .cookie__inner > .cookie__button > a" },
+        { "if": { "visible": ".cookie" }, "then": [{ "wait": 1000 }, { "click": ".cookie > .cookie__inner > .cookie__button > a" }] },
+        { "waitForVisible": ".cookie", "check": "none", "timeout": 5000 }
+    ],
+    "test": [{ "cookieContains": "cookiesubmit=1" }]
+}

package/rules/autoconsent/paypal-us.json

@@ -27,16 +27,17 @@
                             "else": [
                                 { "waitForVisible": ".privacy-sheet-content #formContent" },
                                 {
-                                    "click": "#formContent .cookiepref-11m2iee-checkbox_base input:checked",
+                                    "click": "#formContent input[type='checkbox']:checked",
                                     "all": true,
                                     "optional": true
                                 },
-                                { "click": ".cookieAction.saveCookie,.confirmCookie #submitCookiesBtn" }
+                                { "click": ".cookieAction #submitCookiesBtn" }
                             ]
                         }
                     ]
                 }
             ]
         }
-    ]
+    ],
+    "test": [{ "wait": 1000 }, { "cookieContains": "type%3Dexplicit" }]
 }

package/rules/autoconsent/pornpics-de.json

@@ -1,7 +1,7 @@
 {
     "name": "pornpics.de",
     "runContext": {
-        "urlPattern": "^https?://(www\\.)?pornpics\\.de/"
+        "urlPattern": "^https?://(www\\.)?pornpics\\.(com|de)/"
     },
     "detectCmp": [{ "exists": "#cookie-form" }],
     "detectPopup": [{ "visible": "#cookie-form" }],

package/rules/autoconsent/rule34-xxx.json

@@ -0,0 +1,12 @@
+{
+    "name": "rule34-xxx",
+    "runContext": {
+        "urlPattern": "^https?://(www\\.)?rule34\\.xxx/"
+    },
+    "prehideSelectors": ["#gdprconsent.gdprcontainer"],
+    "detectCmp": [{ "exists": "#gdprconsent.gdprcontainer" }],
+    "detectPopup": [{ "visible": "#gdprconsent.gdprcontainer" }],
+    "optIn": [{ "waitForThenClick": "#gdprconsent .gdprbutton button" }],
+    "optOut": [{ "waitForThenClick": "#gdprconsent .gdprbutton a" }],
+    "test": [{ "cookieContains": "gdpr-consent=0" }]
+}

package/rules/autoconsent/sex.com.json

@@ -0,0 +1,45 @@
+{
+    "name": "sex.com",
+    "runContext": {
+        "urlPattern": "^https?://(\\w+\\.)?sex\\.com/"
+    },
+    "prehideSelectors": ["[class*=\"cookie-consent-required\"]"],
+    "detectCmp": [
+        {
+            "comment": "the flag is cleared once consent is stored, so it prevents re-detecting the leftover markup",
+            "exists": "html[data-cookie-consent-required] [data-testid=\"accept-all-cookie-button\"]"
+        }
+    ],
+    "detectPopup": [
+        {
+            "visible": "[data-testid=\"accept-all-cookie-button\"]"
+        }
+    ],
+    "optIn": [
+        {
+            "comment": "the modal is server-rendered, buttons only respond once the dialog is hydrated and locks scrolling",
+            "waitFor": "body[data-scroll-locked]"
+        },
+        {
+            "waitForThenClick": "[data-testid=\"accept-all-cookie-button\"]"
+        }
+    ],
+    "optOut": [
+        {
+            "comment": "the modal is server-rendered, buttons only respond once the dialog is hydrated and locks scrolling",
+            "waitFor": "body[data-scroll-locked]"
+        },
+        {
+            "comment": "optional categories default to off, so confirming the defaults rejects them",
+            "waitForThenClick": "[data-testid=\"customize-cookie-button\"]"
+        },
+        {
+            "waitForThenClick": "[data-testid=\"confirm-settings-cookie-button\"]"
+        }
+    ],
+    "test": [
+        {
+            "cookieContains": "%22analytics%22%3Afalse"
+        }
+    ]
+}

package/rules/autoconsent/theguardian.com.json

@@ -3,7 +3,7 @@
     "vendorUrl": "https://www.theguardian.com/",
     "comment": "Sourcepoint 'consent or pay' wall shown in the EU/EEA (message 1482251) and UK (message 1482252), where the only reject option requires a paid subscription. The container id embeds the Sourcepoint message id, so we target the pay-wall variants specifically to avoid clashing with the free-reject Sourcepoint popup used in other regions (handled by Sourcepoint-frame). Brittle: message ids may change if the campaign is reconfigured.",
     "cosmetic": true,
-    "minimumRuleStepVersion": 2,
+    "minimumRuleStepVersion": 3,
     "runContext": {
         "urlPattern": "^https?://(\\w+\\.)?theguardian\\.com/",
         "main": true,
@@ -11,11 +11,21 @@
     },
     "prehideSelectors": ["div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']"],
     "detectCmp": [{ "exists": "div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']" }],
-    "detectPopup": [{ "visible": "div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']" }],
+    "detectPopup": [
+        {
+            "any": [
+                { "visible": "div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']" },
+                { "exists": "html.sp-message-open" }
+            ]
+        }
+    ],
     "optIn": [],
     "optOut": [
         { "hide": "div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']" },
-        { "removeClass": "sp-message-open", "selector": "html", "optional": true }
+        {
+            "stylesheet": "html.sp-message-open body { position: static !important; top: auto !important; width: auto !important; overflow: auto !important; }",
+            "stylesheetId": "theguardian-scroll-unlock"
+        }
     ],
     "test": [{ "visible": "div[id='sp_message_container_1482251'],div[id='sp_message_container_1482252']", "check": "none" }]
 }

package/rules/autoconsent/twitch.json

@@ -1,20 +1,35 @@
 {
     "name": "twitch.tv",
     "runContext": {
-        "urlPattern": "^https?://([\\w-]+\\.)?twitch\\.tv"
+        "urlPattern": "^https?://([\\w-]+\\.)?twitch\\.tv/"
     },
-    "prehideSelectors": [
-        "div:has(> .consent-banner .consent-banner__content--gdpr-v2),.ReactModalPortal:has([data-a-target=consent-modal-save])"
+    "prehideSelectors": ["[data-a-target=\"consent-banner\"],.ReactModalPortal:has([data-a-target=consent-modal-save])"],
+    "detectCmp": [{ "exists": "[data-a-target=\"consent-banner\"]" }],
+    "detectPopup": [{ "visible": "[data-a-target=\"consent-banner\"]" }],
+    "optIn": [
+        {
+            "if": { "exists": "[data-a-target=\"consent-banner-accept\"]" },
+            "then": [{ "click": "button[data-a-target=\"consent-banner-accept\"]" }],
+            "else": [{ "click": "[data-a-target=\"consent-banner\"] button:not([data-a-target])" }]
+        }
     ],
-    "detectCmp": [{ "exists": ".consent-banner .consent-banner__content--gdpr-v2" }],
-    "detectPopup": [{ "visible": ".consent-banner .consent-banner__content--gdpr-v2" }],
-    "optIn": [{ "click": "button[data-a-target=\"consent-banner-accept\"]" }],
     "optOut": [
-        { "hide": "div:has(> .consent-banner .consent-banner__content--gdpr-v2)" },
-        { "click": "button[data-a-target=\"consent-banner-manage-preferences\"]" },
-        { "waitFor": "input[type=checkbox][data-a-target=tw-checkbox]" },
-        { "click": "input[type=checkbox][data-a-target=tw-checkbox][checked]:not([disabled])", "all": true, "optional": true },
-        { "waitForThenClick": "[data-a-target=consent-modal-save]" },
-        { "waitForVisible": ".ReactModalPortal:has([data-a-target=consent-modal-save])", "check": "none" }
+        {
+            "if": { "exists": "[data-a-target=\"consent-banner-accept\"]" },
+            "then": [
+                { "click": "[data-a-target=\"consent-banner\"] button:not([data-a-target])" },
+                { "waitForVisible": "[data-a-target=\"consent-banner\"]", "check": "none" }
+            ],
+            "else": [
+                { "click": "button[data-a-target=\"consent-banner-manage-preferences\"]" },
+                { "waitFor": "input[type=checkbox][data-a-target=tw-checkbox]" },
+                {
+                    "click": "input[type=checkbox][data-a-target=tw-checkbox]:not(:checked):not([disabled])",
+                    "optional": true
+                },
+                { "waitForThenClick": "[data-a-target=consent-modal-save]" },
+                { "waitForVisible": ".ReactModalPortal:has([data-a-target=consent-modal-save])", "check": "none" }
+            ]
+        }
     ]
 }

package/rules/autoconsent/wpconsent.json

@@ -0,0 +1,30 @@
+{
+    "name": "WPConsent",
+    "vendorUrl": "https://wordpress.org/plugins/wpconsent-cookies-banner-privacy-suite/",
+    "prehideSelectors": ["#wpconsent-root"],
+    "detectCmp": [
+        {
+            "exists": "#wpconsent-container"
+        }
+    ],
+    "detectPopup": [
+        {
+            "visible": ["#wpconsent-container", "#wpconsent-banner-holder.wpconsent-banner-visible"]
+        }
+    ],
+    "optIn": [
+        {
+            "waitForThenClick": ["#wpconsent-container", "#wpconsent-accept-all"]
+        }
+    ],
+    "optOut": [
+        {
+            "waitForThenClick": ["#wpconsent-container", "#wpconsent-cancel-all"]
+        }
+    ],
+    "test": [
+        {
+            "cookieContains": "wpconsent_preferences="
+        }
+    ]
+}

package/rules/autoconsent/xhamster-eu.json

@@ -8,7 +8,9 @@
     "detectPopup": [{ "visible": "[data-role=\"cookies-modal\"] [data-opt-hydration=\"cookies-dialog-eu\"]" }],
     "optIn": [{ "waitForThenClick": "[data-role=\"cookies-modal\"] [class*=experimentalButtons] button:nth-of-type(1)" }],
     "optOut": [
-        { "waitForThenClick": "[data-role=\"cookies-modal\"] [class*=experimentalButtons] button:nth-of-type(2)" },
+        { "waitForVisible": "[data-role=\"cookies-modal\"] [class*=experimentalButtons] button:nth-of-type(2)" },
+        { "wait": 500 },
+        { "click": "[data-role=\"cookies-modal\"] [class*=experimentalButtons] button:nth-of-type(2)" },
         { "hide": "[data-role=\"cookies-modal\"] [class*=container]", "optional": true }
     ]
 }