diff --git a/database.json b/database.json index 76fe8fe..d85b2fd 100644 --- a/database.json +++ b/database.json @@ -296,7 +296,7 @@ }, { "action": "click", - "domain": "consent.google.com", + "domain": "consent.google", "selector": "[aria-label=\"Alle ablehnen\"], [aria-label=\"Odrzuć wszystko\"], [aria-label=\"Rechazar todo\"], [aria-label=\"Recusar tudo\"], [aria-label=\"Reject all\"], [aria-label=\"Rejeitar tudo\"], [aria-label=\"Respinge tot\"], [aria-label=\"Rifiuta tutto\"], [aria-label=\"Tout refuser\"], [aria-label=\"Отклонить все\"]" }, { @@ -306,7 +306,7 @@ }, { "action": "click", - "domain": "consent.youtube.com", + "domain": "consent.youtube", "selector": "[aria-label=\"Alle ablehnen\"], [aria-label=\"Odrzuć wszystko\"], [aria-label=\"Rechazar todo\"], [aria-label=\"Recusar tudo\"], [aria-label=\"Reject all\"], [aria-label=\"Rejeitar tudo\"], [aria-label=\"Respinge tot\"], [aria-label=\"Rifiuta tutto\"], [aria-label=\"Tout refuser\"], [aria-label=\"Отклонить все\"]" }, { @@ -481,6 +481,7 @@ "||chollometro.com/assets/js/CookiesMessage*.js^", "||cmp.inmobi.com^", "||consent.cookiebot.com^", + "||consent.cookiefirst.com^", "||consent.trustarc.com^", "||consentcdn.cookiebot.com^", "||cookiehub.net^", @@ -525,15 +526,19 @@ "ircan.org", "jobs.lever.co", "key-shortcut.com", + "live.com", "login.microsoftonline.com", "mantisbt.org", "mein.stadtmobil.de", "mossgreen.github.io", "musicmeter.nl", + "office.com", + "office365.com", "personio.com", "restaurantguru.com", "retroachievements.org", "seeklogo.com", + "sharepoint.com", "shuttledirect.com", "sis.redsys.es", "socialdeal.be", @@ -5303,6 +5308,7 @@ ".modal-ley-cookies", ".modal-mask-class", ".modal-strip[data-cookie]", + ".modal[aria-live=\"assertive\"]:has(.cookie-button)", ".modalcooky", ".modCookieBar", ".modCookiesConsent", @@ -6804,6 +6810,7 @@ "[class$=\"BandeauCookies\"]", "[class$=\"UpdatePanelCookie\"]", "[cnn-cookie-policy]", + "[consent-skip-blocker][data-bg] > dialog", "[consent-skip-blocker][data-bg]", "[cookie-unique-name]", "[css-main-site] #policy-div", @@ -13865,5 +13872,5 @@ "ytm-consent-bump-v2-renderer" ] }, - "version": "1725700173038" + "version": "1725777170641" } diff --git a/packages/browser-extension/docs/README.md b/packages/browser-extension/docs/README.md index 2da1a08..61ebe54 100644 --- a/packages/browser-extension/docs/README.md +++ b/packages/browser-extension/docs/README.md @@ -14,7 +14,7 @@ - All browsers based on Chromium 88+ (Blisk, Brave, Colibri, Epic Browser, Iron Browser, Vivaldi and many more) - Google Chrome 109+ - Microsoft Edge 109+ -- Mozilla Firefox 109+ +- Mozilla Firefox 113+ - Mozilla Firefox Mobile 126+ ## Installation (for Mozilla Firefox users) diff --git a/packages/browser-extension/src/manifest.json b/packages/browser-extension/src/manifest.json index 0b2abf6..9ed3b0a 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.2.3", + "version": "7.2.4", "default_locale": "en", "description": "__MSG_appDesc__", "icons": { @@ -22,7 +22,7 @@ "browser_specific_settings": { "gecko": { "id": "{77e2c00b-e173-4604-863d-01645d8d2826}", - "strict_min_version": "109.0", + "strict_min_version": "113.0", "update_url": "https://www.cookie-dialog-monster.com/mozilla/updates.json" } }, @@ -34,12 +34,7 @@ "*://*.codesandbox.io/*", "*://*.facebook.com/*", "*://*.googleapis.com/embed/*", - "*://*.messenger.com/*", - "*://*.office365.com/*", - "*://*.officeapps.live.com/*", "*://*.olympics.com/*", - "*://*.sharepoint.com/*", - "*://*.suite.office.com/*", "*://*.youtube-nocookie.com/embed/*", "*://*.youtube.com/embed/*", "*://translate.google.ca/*", diff --git a/packages/browser-extension/src/scripts/background.js b/packages/browser-extension/src/scripts/background.js index 49c4d04..5ae7192 100644 --- a/packages/browser-extension/src/scripts/background.js +++ b/packages/browser-extension/src/scripts/background.js @@ -65,13 +65,13 @@ const refreshData = (callback) => { const report = async (message, tab, callback) => { try { const reason = message.reason; + const url = message.url; const userAgent = message.userAgent; const version = browser.runtime.getManifest().version; - const body = JSON.stringify({ reason, url: tab.url, userAgent, version }); + const body = JSON.stringify({ reason, url, userAgent, version }); const headers = { 'Cache-Control': 'no-cache', 'Content-type': 'application/json' }; - const url = `${apiUrl}/report/`; - const response = await fetch(url, { body, headers, method: 'POST' }); + const response = await fetch(`${apiUrl}/report/`, { body, headers, method: 'POST' }); callback?.((await response.json()).data); } catch { console.error("Can't send report"); diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js index 63f0756..ca9b188 100644 --- a/packages/browser-extension/src/scripts/content.js +++ b/packages/browser-extension/src/scripts/content.js @@ -125,8 +125,12 @@ function clean(elements, skipMatch) { if (match(element, skipMatch)) { const observer = new MutationObserver(forceElementStyles); - element.setAttribute(dataAttributeName, 'true'); - element.style.setProperty('display', 'none', 'important'); + if (element instanceof HTMLDialogElement) { + element.close(); + } else { + element.setAttribute(dataAttributeName, 'true'); + element.style.setProperty('display', 'none', 'important'); + } observer.observe(element, { attributes: true, @@ -185,8 +189,6 @@ function forceElementStyles(mutations, observer) { if (value === null) { observer.disconnect(); - element.removeAttribute(dataAttributeName); - element.style.removeProperty('display'); } else { element.style.setProperty('display', 'none', 'important'); } @@ -404,10 +406,13 @@ function restoreDOM() { } } - const elements = getElements(`[${dataAttributeName}]`); - - for (const element of elements) { + for (const element of removables) { element.removeAttribute(dataAttributeName); + element.style.removeProperty('display'); + + if (element instanceof HTMLDialogElement) { + element.showModal(); + } } for (const element of [document.body, document.documentElement]) { @@ -500,7 +505,7 @@ browser.runtime.onMessage.addListener(async (message) => { break; } case 'RUN': { - await setUp({ skipRunFn: true }); + await setUp({ skipRunFn: !!removables.length }); run({ elements: removables, skipMatch: true }); break; } diff --git a/packages/browser-extension/src/scripts/dialog.js b/packages/browser-extension/src/scripts/dialog.js index 57200e9..64db741 100644 --- a/packages/browser-extension/src/scripts/dialog.js +++ b/packages/browser-extension/src/scripts/dialog.js @@ -247,7 +247,6 @@ async function submitButtonClickHandler(event) { const issueButton = dialog?.getElementsByClassName('report-dialog-issue-button')[0]; const submitView = dialog?.getElementsByClassName('report-dialog-submit-view')[0]; const userAgent = window.navigator.userAgent; - const issueUrl = await dispatch({ userAgent, reason: reasonText, url: urlText, type: 'REPORT' }); formView?.setAttribute('hidden', 'true'); diff --git a/packages/web/src/mozilla-mobile/updates.json b/packages/web/src/mozilla-mobile/updates.json index 831e377..cf50b16 100644 --- a/packages/web/src/mozilla-mobile/updates.json +++ b/packages/web/src/mozilla-mobile/updates.json @@ -5,6 +5,14 @@ { "version": "7.2.2", "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.2-mozilla-mobile.xpi" + }, + { + "version": "7.2.3", + "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3-mozilla-mobile.xpi" + }, + { + "version": "7.2.4", + "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4-mozilla-mobile.xpi" } ] } diff --git a/packages/web/src/mozilla/updates.json b/packages/web/src/mozilla/updates.json index b46faf1..8680779 100644 --- a/packages/web/src/mozilla/updates.json +++ b/packages/web/src/mozilla/updates.json @@ -41,6 +41,10 @@ { "version": "7.2.3", "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.3.xpi" + }, + { + "version": "7.2.4", + "update_link": "https://www.cookie-dialog-monster.com/releases/7.2.4.xpi" } ] } diff --git a/packages/web/src/releases/7.2.4-mozilla-mobile.xpi b/packages/web/src/releases/7.2.4-mozilla-mobile.xpi new file mode 100644 index 0000000..e6a9009 Binary files /dev/null and b/packages/web/src/releases/7.2.4-mozilla-mobile.xpi differ diff --git a/packages/web/src/releases/7.2.4.xpi b/packages/web/src/releases/7.2.4.xpi new file mode 100644 index 0000000..a229a6f Binary files /dev/null and b/packages/web/src/releases/7.2.4.xpi differ diff --git a/packages/web/src/releases/7.2.4.zip b/packages/web/src/releases/7.2.4.zip new file mode 100644 index 0000000..350b857 Binary files /dev/null and b/packages/web/src/releases/7.2.4.zip differ diff --git a/packages/web/src/releases/latest-mozilla-mobile.xpi b/packages/web/src/releases/latest-mozilla-mobile.xpi index 8670c23..e6a9009 100644 Binary files a/packages/web/src/releases/latest-mozilla-mobile.xpi and b/packages/web/src/releases/latest-mozilla-mobile.xpi differ diff --git a/packages/web/src/releases/latest.xpi b/packages/web/src/releases/latest.xpi index ded2d40..a229a6f 100644 Binary files a/packages/web/src/releases/latest.xpi and b/packages/web/src/releases/latest.xpi differ diff --git a/packages/web/src/releases/latest.zip b/packages/web/src/releases/latest.zip index fc236c9..350b857 100644 Binary files a/packages/web/src/releases/latest.zip and b/packages/web/src/releases/latest.zip differ