From 9621f10283c0faf948a4afb2397d12749a322638 Mon Sep 17 00:00:00 2001 From: ChuckMichael Date: Fri, 24 May 2024 14:00:27 +0200 Subject: [PATCH 1/9] Add Polish language --- .../src/_locales/pl/messages.json | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 packages/browser-extension/src/_locales/pl/messages.json diff --git a/packages/browser-extension/src/_locales/pl/messages.json b/packages/browser-extension/src/_locales/pl/messages.json new file mode 100644 index 0000000..9c7dbbb --- /dev/null +++ b/packages/browser-extension/src/_locales/pl/messages.json @@ -0,0 +1,71 @@ +{ + "appDesc": { + "message": "Czy kto艣 powiedzia艂 co艣 o okienkach pytaj膮cych o ciasteczka? 馃構" + }, + "contextMenu_issueOption": { + "message": "Zobacz zg艂oszenie na GitHubie" + }, + "contextMenu_reportOption": { + "message": "Zg艂o艣 t臋 stron臋" + }, + "contextMenu_settingsOption": { + "message": "Zarz膮dzanie list膮 wyj膮tk贸w" + }, + "options_addButton": { + "message": "Dodaj wyj膮tek" + }, + "options_addPrompt": { + "message": "Wprowad藕 domen臋" + }, + "options_clearButton": { + "message": "Wyczy艣膰 list臋" + }, + "options_exclusionListTitle": { + "message": "Lista wyj膮tk贸w" + }, + "options_exportButton": { + "message": "Wyeksportuj list臋" + }, + "options_filterPlaceholder": { + "message": "Po wpisaniu naci艣nij ENTER, aby filtrowa膰" + }, + "options_importButton": { + "message": "Zaimportuj list臋" + }, + "popup_contributeOption": { + "message": "We藕 udzia艂 w rozwoju projektu" + }, + "popup_helpOption": { + "message": "Potrzebujesz pomocy lub masz problem?" + }, + "popup_rateOption": { + "message": "Oce艅 to rozszerzenie" + }, + "reportDialog_blankPageOption": { + "message": "Strona jest pusta" + }, + "reportDialog_bodyText": { + "message": "Wybierz rodzaj poni偶ej" + }, + "reportDialog_cannotClickOption": { + "message": "Nie da si臋 nic klikn膮膰" + }, + "reportDialog_laggyPageOption": { + "message": "Strona dzia艂a wolno" + }, + "reportDialog_pageNotRespondingOption": { + "message": "Strona nie odpowiada" + }, + "reportDialog_pageVisualGlitchOption": { + "message": "Strona zawiera b艂臋dy w wygl膮dzie" + }, + "reportDialog_popupShowUpOption": { + "message": "Pojawi艂o si臋 okienko" + }, + "reportDialog_submitExtraText": { + "message": "Podczas gdy pracujemy nad rozwi膮zaniem problemu, mo偶esz doda膰 t臋 witryn臋 do listy wyj膮tk贸w w ustawieniach rozszerzenia, albo po prostu wy艂膮czy膰 rozszerzenie dla tej witryny klikaj膮c ikon臋 rozszerzenia na pasku narz臋dzi przegl膮darki." + }, + "reportDialog_submitText": { + "message": "Zg艂oszenie zosta艂o wys艂ane!" + } +} From 044b3a12a5511a022cf2848e138916b1b8e37985 Mon Sep 17 00:00:00 2001 From: ChuckMichael Date: Sat, 25 May 2024 12:52:18 +0200 Subject: [PATCH 2/9] Better translations --- packages/browser-extension/src/_locales/pl/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/browser-extension/src/_locales/pl/messages.json b/packages/browser-extension/src/_locales/pl/messages.json index 9c7dbbb..8671c29 100644 --- a/packages/browser-extension/src/_locales/pl/messages.json +++ b/packages/browser-extension/src/_locales/pl/messages.json @@ -1,15 +1,15 @@ { "appDesc": { - "message": "Czy kto艣 powiedzia艂 co艣 o okienkach pytaj膮cych o ciasteczka? 馃構" + "message": "Czy kto艣 wspomnia艂 o okienkach ze zgod膮 na ciasteczka? 馃構" }, "contextMenu_issueOption": { - "message": "Zobacz zg艂oszenie na GitHubie" + "message": "艢led藕 to zg艂oszenie na GitHubie" }, "contextMenu_reportOption": { "message": "Zg艂o艣 t臋 stron臋" }, "contextMenu_settingsOption": { - "message": "Zarz膮dzanie list膮 wyj膮tk贸w" + "message": "Zarz膮dzaj list膮 wyj膮tk贸w" }, "options_addButton": { "message": "Dodaj wyj膮tek" From 0c65daaf677e7eb785d2f893c5a851b51c460aa4 Mon Sep 17 00:00:00 2001 From: wanhose Date: Mon, 27 May 2024 09:50:05 +0200 Subject: [PATCH 3/9] feat(browser-extension): add declarativeNetRequest to block cmp.inmobi.com --- .gitignore | 11 ++++++----- .prettierignore | 2 +- packages/browser-extension/src/manifest.json | 13 +++++++++++-- packages/browser-extension/src/rules.json | 13 +++++++++++++ 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 packages/browser-extension/src/rules.json diff --git a/.gitignore b/.gitignore index 3d508ee..f5bea76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ +_metadata/ +!.yarn/plugins +!.yarn/releases .DS_Store +.env .pnp.* .yarn/* -!.yarn/releases -!.yarn/plugins -build -node_modules -.env +build/ +node_modules/ diff --git a/.prettierignore b/.prettierignore index ce6654d..b7f3b84 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,2 +1,2 @@ package.json -.yarnrc.yml \ No newline at end of file +.yarnrc.yml diff --git a/packages/browser-extension/src/manifest.json b/packages/browser-extension/src/manifest.json index 59c049b..41a219f 100644 --- a/packages/browser-extension/src/manifest.json +++ b/packages/browser-extension/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "Cookie Dialog Monster", - "version": "7.0.3", + "version": "7.0.4", "default_locale": "en", "description": "__MSG_appDesc__", "icons": { @@ -52,8 +52,17 @@ "run_at": "document_start" } ], + "declarative_net_request": { + "rule_resources": [ + { + "enabled": true, + "id": "ruleset", + "path": "rules.json" + } + ] + }, "host_permissions": ["http://*/*", "https://*/*"], - "permissions": ["contextMenus", "scripting", "storage"], + "permissions": ["contextMenus", "declarativeNetRequest", "scripting", "storage"], "web_accessible_resources": [ { "matches": ["http://*/*", "https://*/*"], diff --git a/packages/browser-extension/src/rules.json b/packages/browser-extension/src/rules.json new file mode 100644 index 0000000..023fa92 --- /dev/null +++ b/packages/browser-extension/src/rules.json @@ -0,0 +1,13 @@ +[ + { + "id": 1, + "priority": 1, + "action": { + "type": "block" + }, + "condition": { + "urlFilter": "||cmp.inmobi.com^", + "resourceTypes": ["script"] + } + } +] From 50fca3c0d3870ab2ebb96833cdc4cc4af176b891 Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:22:28 +0200 Subject: [PATCH 4/9] fix(browser-extension): icon disabled and no count due pageshow not setting up the extension --- packages/browser-extension/src/scripts/content.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js index 43ccf82..e8132e3 100644 --- a/packages/browser-extension/src/scripts/content.js +++ b/packages/browser-extension/src/scripts/content.js @@ -324,6 +324,10 @@ async function setup(skipReadyStateHack) { skips = data?.skips; tokens = data?.tokens; + if (count > 0) { + dispatch({ type: 'SET_BADGE', value: `${count}` }); + } + // 2023-06-13: hack to force clean when data request takes too long and there are no changes later if (document.readyState === 'complete' && !skipReadyStateHack) { window.dispatchEvent(new Event(setupEventName)); @@ -402,6 +406,7 @@ window.addEventListener('load', () => { */ window.addEventListener('pageshow', (event) => { if (document.visibilityState === 'visible' && event.persisted) { + setup(true); window.dispatchEvent(new Event(setupEventName)); } }); From 3a91b3da89d6d3b656f7adcff4d87db9a9ff062f Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:26:40 +0200 Subject: [PATCH 5/9] fix(data): issue #535 --- data/tokens.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/tokens.json b/data/tokens.json index bafa636..39161db 100644 --- a/data/tokens.json +++ b/data/tokens.json @@ -3619,6 +3619,7 @@ ".GlobalConsentBar", ".globalcookiepolicycontainer", ".globalPrivacyBar", + ".glue-cookie-notification-bar", ".gmt_gdpr", ".gn-cookie-alert", ".gn-cookies-warning", @@ -10520,6 +10521,7 @@ "#globalCookies", "#globalmessage", "#glow-cookies-wrapper", + "#glue-cookie-notification-bar-1", "#gm-cookies", "#GMI_Privacy_Policy", "#gn-cookie-accept", From 5251ff25d0bfacfef442b40d70c426b8d6b9c874 Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:32:46 +0200 Subject: [PATCH 6/9] fix(data): issue #537 --- data/tokens.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/tokens.json b/data/tokens.json index 39161db..fd87a56 100644 --- a/data/tokens.json +++ b/data/tokens.json @@ -6862,6 +6862,7 @@ "#cmsCookieWarning", "#cmsInfoCk", "#cmsplus_cookies", + "#cn_banner_form_alta_footer + div:has([data-testid=\"modal\"])", "#cn-cookie", "#cnContainer", "#cnd-gdpr-container", From 308e512cd7844c272c3bf77c6db14a850d2afc4b Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:36:25 +0200 Subject: [PATCH 7/9] fix(data): issue #538 --- data/tokens.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/tokens.json b/data/tokens.json index fd87a56..336a6a7 100644 --- a/data/tokens.json +++ b/data/tokens.json @@ -672,6 +672,7 @@ ".c-simple-cookie-consent", ".c-unique_cookie-attention", ".c09--cookie", + ".c1yxs.c1yxs-mod-visible.c1yxs-mod-z-index-top", ".c24-cookie-consent-wrapper", ".c24-cookie", ".c2g_daimler_cookie_dialog_overlay", @@ -5674,7 +5675,6 @@ "[aria-label=\"Before you continue to Google Search\"]", "[aria-label=\"Cookie consent\"]", "[aria-label=\"cookieconsent\"]", - "[aria-label=\"cookieconsent\"]", "[aria-label=\"cookies\"]", "[aria-label=\"open cookies\"]", "[aria-labelledby=\"cookie_banner_title\"]", @@ -5929,7 +5929,6 @@ "[style=\"background:#eed;padding:10px;margin:0;text-align:center;border-bottom:1px solid #446\"]", "[style=\"bottom: 0px;\"]", "[style=\"bottom: 24px; position: fixed; left: 0px; width: 100%; display: flex; z-index: 1000000; opacity: 1;\"]", - "[style=\"bottom: 24px; position: fixed; left: 0px; width: 100%; display: flex; z-index: 1000000; opacity: 1;\"]", "[style=\"opacity: 1; x: 1px; y: 0px; transform: translateY(0px) scale(1, 1); --Toaster-indicatorColor:#24A0ED;\"]", "[style=\"overflow: hidden; position: absolute; top: 0px; width: 379px; z-index: 991; height: 180px; margin-top: 70px; right: 0px; margin-right: 25px;\"]", "[style=\"position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; z-index: 999; background-color: rgba(0, 0, 0, 0.3);\"]", @@ -7668,7 +7667,6 @@ "#cookie-informations", "#cookie-informer", "#cookie-inner-wrapper", - "#cookie-inner-wrapper", "#cookie-jar-policy-banner", "#cookie-jar", "#cookie-kontrol", @@ -8510,7 +8508,6 @@ "#cookieMessagelightbox", "#cookieMessageModul", "#cookieMessageOuter", - "#cookieMessageOuter", "#cookieMessagesContainer", "#cookieMessageWrapper", "#CookieMessaging", From 7fdf59745cae9422487b7cd974163456ce5a7ae1 Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:40:45 +0200 Subject: [PATCH 8/9] fix(data): issue #540 --- data/tokens.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/tokens.json b/data/tokens.json index 336a6a7..fde2925 100644 --- a/data/tokens.json +++ b/data/tokens.json @@ -5847,6 +5847,7 @@ "[data-react-class=\"CookieNotice\"]", "[data-react-class=\"EUCookieBanner\"]", "[data-role=\"cookie-policy-banner\"]", + "[data-role=\"gdpr-cookie-container\"]", "[data-section-type=\"CookiesBanner\"]", "[data-selector=\"container@cookiebar\"]", "[data-selector=\"cookie-policy\"]", From c890778e7a289a7ac5e60e64503255751d12b683 Mon Sep 17 00:00:00 2001 From: wanhose Date: Sat, 1 Jun 2024 10:45:39 +0200 Subject: [PATCH 9/9] fix(data): issue #541 --- data/tokens.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/tokens.json b/data/tokens.json index fde2925..365ec0e 100644 --- a/data/tokens.json +++ b/data/tokens.json @@ -12686,7 +12686,6 @@ "#wt-confirm-layer", "#wt-cookie-bar", "#wt-cookie-box", - "#wt-modal-container", "#WTCookieDiv", "#wucAcceptCookies_panAcceptCookies", "#wvc-privacy-policy-message-content",