From 1723c79e41f3a2f2a495db456443341041ae2676 Mon Sep 17 00:00:00 2001 From: Guus van der Meer Date: Thu, 28 Dec 2023 21:25:51 +0100 Subject: [PATCH] Fixed sites #20 (#10586) {auto_update} Added support for https://nu.nl Added support for https://autoweek.nl Added support for https://calm.com Added support for https://daswetter.com Added support for https://tunemymusic.com Added support for https://webopedia.com Added support for https://drudgereport.com Added support for https://parksystems.com Added support for https://mediamarkt.es Added support for https://lightexpert.nl Added support for https://bauer-baumschulen.ch Added support for https://biggreenegg.co.uk Added support for https://kamera-express.be Added support for https://cameraworld.co.uk Added support for https://douglas.XX Added support for https://favoptic.se --- - fixes #10605 - fixes #10596 - fixes #10592 - fixes #10591 - fixes #10588 - fixes #10582 - fixes #10575 - fixes #10572 - fixes #10569 - fixes #10543 - fixes #10535 - fixes #10533 - fixes #10532 - fixes #10531 - fixes #10530 - fixes #10095 - fixes #9802 - fixes #9734 - fixes #9616 - fixes #6600 - fixes #5991 - fixes #5425 - fixes #3120 --- package-lock.json | 4 +- src/data/css/common.css | 4 - src/data/js/0_defaultClickHandler.js | 36 +++++- src/data/js/5_clickHandler.js | 5 +- src/data/js/6_cookieHandler.js | 2 - src/data/rules.js | 165 +++++++-------------------- 6 files changed, 79 insertions(+), 137 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3bed6a8d..be51bd87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "isdcac", - "version": "1.1.0", + "version": "1.1.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "isdcac", - "version": "1.1.0", + "version": "1.1.2", "license": "GPL-3.0", "devDependencies": { "eslint": "^8.24.0", diff --git a/src/data/css/common.css b/src/data/css/common.css index 99cd9f61..2dc094e5 100644 --- a/src/data/css/common.css +++ b/src/data/css/common.css @@ -46,10 +46,6 @@ body.cli-barmodal-open { overflow: visible !important; } -iframe[title^="SP Consent Message"] { - display: none !important; -} - html.sp-message-open, html.sp-message-open body, html.disable--interaction.show--consent, diff --git a/src/data/js/0_defaultClickHandler.js b/src/data/js/0_defaultClickHandler.js index 039845dc..a00e99ff 100644 --- a/src/data/js/0_defaultClickHandler.js +++ b/src/data/js/0_defaultClickHandler.js @@ -6,10 +6,7 @@ const searchPairs = { ".wp-exclude-emoji": [ 'div[id^="bnnr"] > div[style*="; order: 1"] span', - 'div[id^="bnnr"]:not([style*="float"]) > div[style*="; order: 0"] + div[style*="; order: 2"] span', - 'div[id^="bnnr"]:not([style*="float"]) > div[style*="; order: 0"] + div[style*="; order: 3"] span', - 'div[id^="bnnr"][style*="float"] > div[style*="; order: 0"] + div[style*="; order: 2"][style*="underline"] span', - 'div[id^="bnnr"][style*="float"] > div[style*="; order: 0"] + div[style*="; order: 2"]:not([style*="underline"])', + "a[data-order]:nth-child(2) span", ], "#usercentrics-root": [ @@ -30,13 +27,16 @@ "button.sp_choice_type_12:not(.cmp-no-pur-privacy-btn)", ".sp_choice_type_SAVE_AND_EXIT", "div:not(.header) > .sp_choice_type_11:only-of-type:not(:only-child)", + "#notice > div:nth-child(3) .message-column:first-child:not(:only-child) .sp_choice_type_11", + ".sp_choice_type_11.button-responsive-primary", + ".sp_choice_type_13", ], ".mfp-wrap.mfp-ready": [ ".cookieselection-confirm-selection", "#gdpr_understandBtn", "#cookiebanner .button-row > :not(.consentToAll)", - "#cookiebanner .confirmSelection", + 'div[id*="cookiebanner"] .confirmSelection', '#cookieConsent .btn[data-cookie="accepted"]', ".avia-cookie-close-bar", ".cookies-save-and-close-btn", @@ -60,8 +60,18 @@ "#__tealiumGDPRecModal": [ "#privacy_pref_optin", + "#consent_prompt_preferences", "#consent_prompt_submit", ".container-cookie-modal-footer-refuse", + ".cl-btn--reject-all", + ], + + "#__tealiumGDPRcpPrefs": [ + '#privacy_prompt[style*="block"] #preferences_prompt_decline', + '.consent-manager[style*="block"] #cm-acceptNone', + '.consent-manager[style*="block"] #consent_wall_optout', + '.tiq_cm[style*="block"] #deny_full_submit_1', + "#preferences_prompt_submit", ], ".fancybox-lock": [ @@ -98,6 +108,8 @@ ], ".modal-open": [ + '#dialog[style*="block"] #btn-configure-cookies', + '#dialog[style*="block"] #user_cookies_form_save + #refuse-all-cookies', '#PrivacyCategoryAlert[style*="block"] .btn[data-id="ConfirmSettings"]', '#cookie-control-modal[style*="block"] .js-toggle-cookie-control', '.kmt-ckextmodal[style*="block"] .btn[href*="accept"]', @@ -109,6 +121,8 @@ '#cookie-manager-window[style*="block"] #accept-selected', ".ck-user-cookie-consent-modal #js-save-cookie-settings", '#cookie-consent-modal[style*="block"] ~ .modal #cc-save-preferences', + '#privacy-consent[style*="block"] #current-settings-save', + '#modal-privacy-settings[style*="block"] .btn[data-grant="selected"]', ], '.modal[style*="block"]': [ @@ -174,6 +188,18 @@ "#btnCookieNecessary", ".btn.cookies-decline", "#cookieConsentConfigBtnDecline", + "#continueWithoutAccepting", + "#cookieSavingButton", + "#gdpr-save-settings.btn", + ".js-consent-btn-manage + .js-consent-btn-decline", + "#cookiebar-decline", + 'button[data-omcookie-panel-save="min"]', + "#cookieModuleRejectAll", + ".refuseAllCookies", + "#cookieDenyButton", + 'button[data-save-action="decline-all"]', + "#bccs-buttonDoNotAgree", + "#bccs-buttonAgreeRequired:first-child", ], }; diff --git a/src/data/js/5_clickHandler.js b/src/data/js/5_clickHandler.js index 9ae71f48..1d78e6b1 100644 --- a/src/data/js/5_clickHandler.js +++ b/src/data/js/5_clickHandler.js @@ -286,7 +286,7 @@ function getSelector(host) { return '.gdpr-modal-wrapper._show .allow-necessary, #cookies-modal-id[style*="block"] .save-cookies'; case "douglas": return _chain( - ".uc-banner-modal .uc-list__buttons ", + ".uc-banner-modal .uc-list-button__more-information", ".uc-list-button__deny-all" ); case "easyname": @@ -530,6 +530,7 @@ function getSelector(host) { case "sourcepoint.theguardian.com": return "button.sp_choice_type_13, button.sp_choice_type_12, .sp_choice_type_SAVE_AND_EXIT"; case "cmp.dpgmedia.nl": + case "cmp.autoweek.nl": return _chain( '.sp_choice_type_12, .tcfv2-stack[title*="Social"] .pm-switch', ".sp_choice_type_SAVE_AND_EXIT" @@ -7202,6 +7203,8 @@ function getSelector(host) { case "saturn.de": case "mediaworld.it": // same as mediamarkt return '#mms-consent-portal-container button[data-test*="save-settings"]'; + case "cameraworld.co.uk": + return "#btn-cookie-decline"; } if (host.parts.length > 2) { diff --git a/src/data/js/6_cookieHandler.js b/src/data/js/6_cookieHandler.js index 22111693..15a6d4ca 100644 --- a/src/data/js/6_cookieHandler.js +++ b/src/data/js/6_cookieHandler.js @@ -341,8 +341,6 @@ function getE(hostname) { return ["fvw_privacy=enabled"]; case "kinoheld.de": return ["KHCONSENT=accept"]; - case "calm.com": - return ["has-agreed-to-cookies=true"]; case "resursbank.se": return ["cookie_consent=necessary%3A1%2Cstatistics%3A0%2Cmarketing%3A0"]; case "airmates.eu": diff --git a/src/data/rules.js b/src/data/rules.js index 26fbaaf8..f24caac9 100644 --- a/src/data/rules.js +++ b/src/data/rules.js @@ -2127,6 +2127,7 @@ const rules = { "mediamarkt.at": { j: 5 }, "mediamarkt.be": { j: 5 }, "mediaworld.it": { j: 5 }, + "mediamarkt.es": { j: 5 }, "saturn.de": { j: 5 }, "gonnesa.ca.it": { s: "#fake-div{display:none !important}" }, "motorsport.com": { @@ -10423,7 +10424,7 @@ const rules = { "automobilwoche.de": { s: "#ccm{display:none !important}" }, "5vor12.de": { s: ".consent_banner{display:none !important}" }, "jimenezmovilidad.es": { c: 0 }, - "calm.com": { j: "6" }, + "calm.com": { s: "#cookie-preferences-banner{display:none !important}" }, "otv.de": { j: "5" }, "nordicbet.dk": { c: 32 }, "nordicbet.com": { c: 32 }, @@ -14085,6 +14086,7 @@ const rules = { "photospecialist.at": { c: 20 }, "photospecialist.de": { c: 20 }, "kamera-express.nl": { c: 20 }, + "kamera-express.be": { c: 20 }, "kamera-express.lu": { c: 20 }, "kamera-express.de": { c: 20 }, "helpster.de": { j: "5" }, @@ -17028,6 +17030,25 @@ const rules = { "swedbankrobur.se": { c: 85 }, "tobycarvery.co.uk": { c: 85 }, "toshiba-aircondition.com": { c: 85 }, + "autoweek.nl": { j: 5 }, + "tunemymusic.com": { + s: ".HeaderMenu_CookieAlert__ipEfK{display:none !important}", + }, + "webopedia.com": { s: ".wo-consent{display:none !important}" }, + "drudgereport.com": { s: "#dr_dae_consent{display:none !important}" }, + "parksystems.com": { + s: ".seers-cmp-cookie-data-hol{display:none !important}", + }, + "lightexpert.nl": { s: "#cookie{display:none !important}" }, + "biggreenegg.co.uk": { + s: ".TheBiscuitBanner{display:none !important}", + c: 85, + }, + "cameraworld.co.uk": { + j: 5, + s: "._has-modal{overflow: unset!important} .pr-cookie-modal-wall, .modals-overlay{display:none !important}", + }, + "favoptic.se": { c: 14 }, }; const blockUrls = { @@ -18131,59 +18152,6 @@ const blockUrls = { ], }, { r: "/contao-privacy-center.js" }, - { - r: "privacy-mgmt.com", - e: [ - "standard.co.uk", - "theguardian.com", - "theguardian.com.", - "bild.de", - "computerbild.de", - "bold.dk", - "welt.de", - "t-online.de", - "focus.de", - "chip.de", - "faz.net", - "n-tv.de", - "spiegel.de", - "privacy-mgmt.com", - "wunderweib.de", - "helpster.de", - "tvmovie.de", - "praxisvita.de", - "cosmopolitan.de", - "giga.de", - "ostsee-zeitung.de", - "sky.com", - "lvz.de", - "mein-schoener-garten.de", - "boerse-online.de", - "tvspielfilm.de", - "autobild.de", - "bike-bild.de", - "bz-berlin.de", - "cyberport.at", - "cyberport.de", - "golem.de", - "express.de", - "tv8.it", - "epaper.volksstimme.de", - "volkskrant.nl", - "rtl2.de", - "si.com", - "derstandard.de", - "derstandard.at", - "unsere-helden.com", - "rtl.de", - "stern.de", - "freenet-funk.de", - "maennersache.de", - "t3n.de", - "is.fi", - "heise.de", - ], - }, { r: "privacy-policy.u-lab.nl" }, { r: "trustcommander.net/privacy", @@ -18253,6 +18221,7 @@ const blockUrls = { { r: "apps.ludostation.com/cmp/v2/cmp.js" }, { r: "mrdev-cmp/assets/js/script.js" }, { r: "cmp.setupcmp.com" }, + { r: "cmp.meteored.com" }, ], Cookie: [ { r: "gofundme.com/js/3.0/visitorCookie.js" }, @@ -18545,75 +18514,6 @@ const blockUrls = { }, { r: "/datenschutz.min.js" }, { r: "/ccm19.js" }, - { - r: "/wrapperMessagingWithoutDetection.js", - e: [ - "lecker.de", - "standard.co.uk", - "ladbible.com", - "theguardian.com", - "theguardian.com.", - "bild.de", - "autoweek.nl", - "computerbild.de", - "bold.dk", - "welt.de", - "t-online.de", - "sport1.de", - "focus.de", - "chip.de", - "faz.net", - "n-tv.de", - "wunderweib.de", - "helpster.de", - "tvmovie.de", - "praxisvita.de", - "cosmopolitan.de", - "giga.de", - "ostsee-zeitung.de", - "sky.com", - "lvz.de", - "mein-schoener-garten.de", - "boerse-online.de", - "tvspielfilm.de", - "autobild.de", - "bike-bild.de", - "bz-berlin.de", - "travelbook.de", - "cyberport.at", - "cyberport.de", - "golem.de", - "express.de", - "ksta.de", - "utopia.de", - "video.sky.it", - "bndestem.nl", - "volkskrant.nl", - "rundschau-online.de", - "rtl2.de", - "capital.fr", - "derstandard.de", - "derstandard.at", - "unsere-helden.com", - "rtl.de", - "stern.de", - "myaccount.hln.be", - "nu.nl", - "maennersache.de", - "dpgmedia.nl", - "destentor.nl", - "zeit.de", - "ad.nl", - "dpgmedia.be", - "t3n.de", - "gelderlander.nl", - "gld.nl", - "aftonbladet.se", - "sp-prod.net", - "is.fi", - "heise.de", - ], - }, { r: "/app.dsgvo.min.js" }, { r: "/trigoAboveBox.jquery.js" }, { r: "/dsgvoinit.min.js" }, @@ -19096,6 +18996,25 @@ const blockUrls = { "eurostar.com": ["/utag.js"], "wko.at": ["/static/ct/consent.js"], "oem.no": ["/ui/common/scripts/cookies/cookieModalComponent-797ec8a07a.js"], + "politico.eu": ["/wrapperMessagingWithoutDetection"], + "lovelybooks.de": ["/wrapperMessagingWithoutDetection"], + "idealo.de": ["/wrapperMessagingWithoutDetection"], + "idealo.at": ["/wrapperMessagingWithoutDetection"], + "idealo.es": ["/wrapperMessagingWithoutDetection"], + "idealo.fr": ["/wrapperMessagingWithoutDetection"], + "idealo.it": ["/wrapperMessagingWithoutDetection"], + "idealo.co.uk": ["/wrapperMessagingWithoutDetection"], + "femmeactuelle.fr": ["/wrapperMessagingWithoutDetection"], + "hausjournal.net": ["/wrapperMessagingWithoutDetection"], + "lepoint.fr": ["/wrapperMessagingWithoutDetection"], + "chefkoch.de": ["/wrapperMessagingWithoutDetection"], + "vg.no": ["/wrapperMessagingWithoutDetection.js", "cmp."], + "boerse.de": ["/wrapperMessagingWithoutDetection.js"], + "bt.no": ["/wrapperMessagingWithoutDetection.js"], + "liberation.fr": ["/wrapperMessagingWithoutDetection.js"], + "caradisiac.com": ["/wrapperMessagingWithoutDetection"], + "anderes-wort.de": ["/wrapperMessagingWithoutDetection"], + "bauer-baumschulen.ch": ["/CookieBanner.js"], }, };