From ecbdb3a00d8422882be90ae31eebc486577b2900 Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Sun, 25 Aug 2024 13:55:38 +0200
Subject: [PATCH 1/6] refactor(browser-extension): report dialog to allow user
 input in both reason and url fields

---
 .../browser-extension/src/scripts/dialog.js   | 224 +++++++++++-------
 .../browser-extension/src/styles/dialog.css   | 222 ++++++++++-------
 2 files changed, 265 insertions(+), 181 deletions(-)

diff --git a/packages/browser-extension/src/scripts/dialog.js b/packages/browser-extension/src/scripts/dialog.js
index cb81326..57200e9 100644
--- a/packages/browser-extension/src/scripts/dialog.js
+++ b/packages/browser-extension/src/scripts/dialog.js
@@ -2,19 +2,6 @@ if (typeof browser === 'undefined') {
   browser = chrome;
 }
 
-/**
- * @description Report reasons
- * @type {string[]}
- */
-const reasons = [
-  'Cannot click',
-  'Page contains visual glitches',
-  'Page is blank',
-  'Page is laggy',
-  'Page is not responding',
-  'Popup showed up',
-];
-
 /**
  * @description Report dialog ID
  */
@@ -48,63 +35,48 @@ const reportDialogHtml = `
           ${browser.i18n.getMessage('reportDialog_bodyText')}
         </div>
         <div class="report-dialog-form">
-          <div class="report-dialog-radio-group">
-            <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="0"
-              role="radio"
-              tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_cannotClickOption')}
+          <div class="report-dialog-input-group">
+            <div class="report-dialog-input-label" id="report-dialog-label-url">
+              ${browser.i18n.getMessage('reportDialog_urlInputLabel')}
+              <span class="report-dialog-input-label-required">*</span>
             </div>
             <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="1"
-              role="radio"
+              aria-labelledby="report-dialog-label-url"
+              aria-multiline="false"
+              aria-required="true"
+              class="report-dialog-input"
+              contenteditable="true"
+              id="report-dialog-input-url"
+              role="textbox"
               tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_pageVisualGlitchOption')}
-            </div>
-            <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="2"
-              role="radio"
-              tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_blankPageOption')}
-            </div>
-            <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="3"
-              role="radio"
-              tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_laggyPageOption')}
-            </div>
-            <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="4"
-              role="radio"
-              tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_pageNotRespondingOption')}
-            </div>
-            <div
-              aria-checked="false"
-              class="report-dialog-radio"
-              data-value="5"
-              role="radio"
-              tabindex="0"
-            >
-              ${browser.i18n.getMessage('reportDialog_popupShowUpOption')}
+            ></div>
+            <div class="report-dialog-input-error" id="report-dialog-input-url-error">
+              ${browser.i18n.getMessage('reportDialog_urlInputError')}
             </div>
           </div>
-          <div aria-disabled="true" class="report-dialog-submit-button" role="button" tabindex="0">
+          <div class="report-dialog-input-group">
+            <div class="report-dialog-input-label" id="report-dialog-label-reason">
+              ${browser.i18n.getMessage('reportDialog_reasonInputLabel')}
+              <span class="report-dialog-input-label-required">*</span>
+            </div>
+            <div
+              aria-labelledby="report-dialog-label-reason"
+              aria-multiline="true"
+              aria-placeholder="${browser.i18n.getMessage('reportDialog_reasonInputLabel')}"
+              aria-required="true"
+              class="report-dialog-input"
+              contenteditable="true"
+              id="report-dialog-input-reason"
+              role="textbox"
+              tabindex="0"
+            >
+              ${browser.i18n.getMessage('reportDialog_reasonInputPlaceholder')}
+            </div>
+            <div class="report-dialog-input-error" id="report-dialog-input-reason-error">
+              ${browser.i18n.getMessage('reportDialog_reasonInputError')}
+            </div>
+          </div>
+          <div class="report-dialog-submit-button" role="button" tabindex="0">
             ${browser.i18n.getMessage('contextMenu_reportOption')?.replace('...', '')}
           </div>
         </div>
@@ -156,22 +128,38 @@ function hideReportDialog() {
 }
 
 /**
- * @description Dialog radio input click handler
- * @param {MouseEvent} event
+ * @description Input change handler
+ * @param {InputEvent} event
  */
-function radioClickHandler(event) {
-  const dialog = document.getElementById(reportDialogId);
-  const radios = dialog.getElementsByClassName('report-dialog-radio');
-  const submitButton = dialog?.getElementsByClassName('report-dialog-submit-button')[0];
+function inputChangeHandler(event) {
+  event.currentTarget.removeAttribute('aria-invalid');
+}
 
-  for (const radio of radios) {
-    radio.setAttribute('aria-checked', 'false');
+/**
+ * @description Input key down handler
+ * @param {KeyboardEvent} event
+ */
+function inputKeyDownHandler(event) {
+  if (event.key === 'Enter') {
+    event.preventDefault();
+    event.currentTarget.blur();
   }
+}
 
+/**
+ * @description Input paste handler
+ * @param {ClipboardEvent} event
+ */
+function inputPasteHandler(event) {
   event.preventDefault();
-  event.currentTarget.setAttribute('aria-checked', 'true');
-  submitButton.setAttribute('aria-disabled', 'false');
-  submitButton.addEventListener('click', submitButtonClickHandler);
+  const text = event.clipboardData?.getData('text').replace(/\r?\n|\r/g, ' ');
+
+  const selection = window.getSelection();
+
+  if (selection.rangeCount) {
+    selection.deleteFromDocument();
+    selection.getRangeAt(0).insertNode(document.createTextNode(text));
+  }
 }
 
 /**
@@ -181,7 +169,12 @@ function showReportDialog() {
   const existingDialog = document.getElementById(reportDialogId);
 
   if (existingDialog) {
+    const submitButton = existingDialog.getElementsByClassName('report-dialog-submit-button')[0];
+    const urlInput = existingDialog.querySelector('#report-dialog-input-url');
+
     existingDialog.showModal();
+    submitButton.setAttribute('aria-disabled', 'false');
+    urlInput.textContent = window.location.origin + window.location.pathname;
     return;
   }
 
@@ -190,16 +183,23 @@ function showReportDialog() {
   const dialog = result.body.firstElementChild;
   const closeButton = dialog.getElementsByClassName('report-dialog-close-button')[0];
   const link = document.createElement('link');
-  const radios = dialog.getElementsByClassName('report-dialog-radio');
+  const reasonInput = dialog?.querySelector('#report-dialog-input-reason');
+  const submitButton = dialog?.getElementsByClassName('report-dialog-submit-button')[0];
+  const urlInput = dialog?.querySelector('#report-dialog-input-url');
 
   closeButton.addEventListener('click', closeButtonClickHandler);
+  dialog.querySelector('#report-dialog-input-url').textContent =
+    window.location.origin + window.location.pathname;
   link.setAttribute('href', 'https://fonts.googleapis.com/css?family=Inter');
   link.setAttribute('id', 'report-dialog-font');
   link.setAttribute('rel', 'stylesheet');
-
-  for (const radio of radios) {
-    radio.addEventListener('click', radioClickHandler);
-  }
+  reasonInput.addEventListener('input', inputChangeHandler);
+  reasonInput.addEventListener('keydown', inputKeyDownHandler);
+  reasonInput.addEventListener('paste', inputPasteHandler);
+  submitButton.addEventListener('click', submitButtonClickHandler);
+  urlInput.addEventListener('input', inputChangeHandler);
+  urlInput.addEventListener('keydown', inputKeyDownHandler);
+  urlInput.addEventListener('paste', inputPasteHandler);
 
   dispatch({ type: 'INSERT_DIALOG_CSS' });
   document.body.appendChild(dialog);
@@ -212,31 +212,77 @@ function showReportDialog() {
  * @param {MouseEvent} event
  */
 async function submitButtonClickHandler(event) {
-  const target = event.currentTarget;
+  event.preventDefault();
 
-  if (target.getAttribute('aria-disabled') === 'true') {
+  if (event.currentTarget.getAttribute('aria-disabled') === 'true') {
     return;
   }
 
-  event.preventDefault();
-  target.setAttribute('aria-disabled', 'true');
+  event.currentTarget.setAttribute('aria-disabled', 'true');
 
   const dialog = document.getElementById(reportDialogId);
+  const reasonInput = dialog?.querySelector('#report-dialog-input-reason');
+  const reasonText = reasonInput?.textContent.trim();
+  const urlInput = dialog?.querySelector('#report-dialog-input-url');
+  const urlText = urlInput?.textContent.trim();
+
+  const errors = validateForm({ reason: reasonText, url: urlText });
+
+  if (errors) {
+    if (errors.reason) {
+      reasonInput?.setAttribute('aria-invalid', 'true');
+      reasonInput?.setAttribute('aria-errormessage', 'report-dialog-input-reason-error');
+    }
+
+    if (errors.url) {
+      urlInput?.setAttribute('aria-invalid', 'true');
+      urlInput?.setAttribute('aria-errormessage', 'report-dialog-input-url-error');
+    }
+
+    event.currentTarget.setAttribute('aria-disabled', 'false');
+    return;
+  }
+
   const formView = dialog?.getElementsByClassName('report-dialog-form-view')[0];
   const issueButton = dialog?.getElementsByClassName('report-dialog-issue-button')[0];
-  const option = dialog?.querySelector('.report-dialog-radio[aria-checked="true"]');
-  const reasonIndex = option?.dataset.value;
-  const reason = Number.isNaN(reasonIndex) ? 'Unknown' : reasons[reasonIndex];
   const submitView = dialog?.getElementsByClassName('report-dialog-submit-view')[0];
   const userAgent = window.navigator.userAgent;
 
-  const issueUrl = await dispatch({ userAgent, reason, type: 'REPORT' });
+  const issueUrl = await dispatch({ userAgent, reason: reasonText, url: urlText, type: 'REPORT' });
 
   formView?.setAttribute('hidden', 'true');
   issueButton?.addEventListener('click', () => window.open(issueUrl, '_blank'));
   submitView?.removeAttribute('hidden');
 }
 
+/**
+ * @description Validate form
+ * @param {{ reason: string | undefined | undefined, url: string | undefined }} params
+ * @returns {{ reason: string | undefined, url: string | undefined } | undefined}
+ */
+function validateForm(params) {
+  const { reason, url } = params;
+  let errors = undefined;
+
+  if (!reason || reason.length < 10 || reason.length > 1000) {
+    errors = {
+      ...(errors ?? {}),
+      reason: browser.i18n.getMessage('reportDialog_reasonInputError'),
+    };
+  }
+
+  try {
+    new URL(url);
+  } catch {
+    errors = {
+      ...(errors ?? {}),
+      url: browser.i18n.getMessage('reportDialog_urlInputError'),
+    };
+  }
+
+  return errors;
+}
+
 /**
  * @description Listen to messages
  */
diff --git a/packages/browser-extension/src/styles/dialog.css b/packages/browser-extension/src/styles/dialog.css
index 262b55b..f4934e3 100644
--- a/packages/browser-extension/src/styles/dialog.css
+++ b/packages/browser-extension/src/styles/dialog.css
@@ -1,4 +1,5 @@
 :root {
+  --cookie-dialog-monster-color-error: #cc0000;
   --cookie-dialog-monster-color-primary: #3dd9eb;
   --cookie-dialog-monster-color-secondary: #34495e;
   --cookie-dialog-monster-color-success: #5cb85c;
@@ -26,23 +27,41 @@
 
 #report-dialog * {
   box-sizing: border-box;
-  visibility: visible;
 }
-.report-dialog-body {
+
+#report-dialog div {
+  all: unset;
+  display: block;
+  box-sizing: border-box;
+}
+
+#report-dialog *::-moz-selection {
+  color: var(--cookie-dialog-monster-color-white);
+  background: var(--cookie-dialog-monster-color-tertiary);
+}
+
+#report-dialog *::selection {
+  color: var(--cookie-dialog-monster-color-white);
+  background: var(--cookie-dialog-monster-color-tertiary);
+}
+
+#report-dialog .report-dialog-body {
   display: block;
   font-size: 14px;
-  line-height: 14px;
+  line-height: 1.2;
   padding: 16px;
 }
 
-.report-dialog-body-text {
+#report-dialog .report-dialog-body-text {
   display: block;
   font-family: Inter, Arial, Helvetica, sans-serif;
+  font-size: 14px;
+  line-height: 1.2;
   margin: 0px;
   padding: 0px;
 }
 
-.report-dialog-close-button {
+#report-dialog .report-dialog-close-button {
   align-items: center;
   background-color: transparent;
   border: none;
@@ -53,119 +72,138 @@
   margin: 0px;
   outline: none;
   padding: 0px;
-  transition: 0.4s;
 }
 
-.report-dialog-close-button {
+#report-dialog .report-dialog-close-button {
   stroke: var(--cookie-dialog-monster-color-white);
 }
 
-.report-dialog-close-button:focus,
-.report-dialog-close-button:hover > svg {
+#report-dialog .report-dialog-close-button:focus,
+#report-dialog .report-dialog-close-button:hover > svg {
   stroke: var(--cookie-dialog-monster-color-secondary);
 }
 
-.report-dialog-close-button:focus-visible {
+#report-dialog .report-dialog-close-button:focus-visible {
   box-shadow: initial;
   transition: initial;
 }
 
-.report-dialog-close-button:focus,
-.report-dialog-close-button:hover {
+#report-dialog .report-dialog-close-button:focus,
+#report-dialog .report-dialog-close-button:hover {
   background-color: var(--cookie-dialog-monster-color-white);
 }
-.report-dialog-form {
+
+#report-dialog .report-dialog-form {
+  display: grid;
+  gap: 10px;
+}
+
+#report-dialog .report-dialog-form-view {
   display: flex;
   flex-direction: column;
   gap: 24px;
 }
 
-.report-dialog-form-view {
-  display: flex;
-  flex-direction: column;
-  gap: 24px;
-}
-
-.report-dialog-form-view[hidden] {
+#report-dialog .report-dialog-form-view[hidden] {
   display: none;
 }
-.report-dialog-header {
+
+#report-dialog .report-dialog-header {
   align-items: center;
   background-color: var(--cookie-dialog-monster-color-secondary);
   display: flex;
   font-size: 16px;
   height: 54px;
   justify-content: space-between;
-  line-height: 16px;
+  line-height: 1.2;
   padding: 16px;
 }
 
-.report-dialog-header-title {
+#report-dialog .report-dialog-header-title {
   color: var(--cookie-dialog-monster-color-white);
   font-family: Inter, Arial, Helvetica, sans-serif;
   font-weight: 500;
 }
-.report-dialog-radio {
-  color: var(--cookie-dialog-monster-color-tertiary);
-  cursor: pointer;
-  display: block;
-  font-family: Inter, Arial, Helvetica, sans-serif;
-  outline: none;
-  padding-left: 24px;
-  position: relative;
-}
 
-.report-dialog-radio[aria-checked='true']:after {
-  opacity: 1;
-  transform: scale(1, 1);
-}
-
-.report-dialog-radio:after {
-  background-color: var(--cookie-dialog-monster-color-primary);
-  border-radius: 50%;
-  box-sizing: border-box;
-  content: '';
-  display: block;
-  height: 8px;
-  left: 3px;
-  opacity: 0;
-  position: absolute;
-  top: 3px;
-  transform: scale(0, 0);
-  transition: all 0.2s cubic-bezier(0.64, 0.57, 0.67, 1.53);
-  width: 8px;
-}
-
-.report-dialog-radio:focus:not([aria-checked='true']):after,
-.report-dialog-radio:hover:not([aria-checked='true']):after {
-  background: var(--cookie-dialog-monster-color-tertiary);
-  opacity: 1;
-  transform: scale(1, 1);
-}
-
-.report-dialog-radio:before {
-  background: var(--cookie-dialog-monster-color-white);
+#report-dialog .report-dialog-input {
   border: 1px solid var(--cookie-dialog-monster-color-tertiary);
-  border-radius: 50%;
-  box-sizing: border-box;
-  content: '';
-  display: block;
-  height: 14px;
-  left: 0px;
-  margin-right: 5px;
-  position: absolute;
-  top: 0px;
-  width: 14px;
+  border-radius: 4px;
+  color: var(--cookie-dialog-monster-color-secondary);
+  cursor: text;
+  font-family: Inter, Arial, Helvetica, sans-serif;
+  font-size: 14px;
+  line-height: 1;
+  outline: none;
+  padding: 12px 8px;
 }
 
-.report-dialog-radio-group {
+#report-dialog .report-dialog-input:hover {
+  border-color: var(--cookie-dialog-monster-color-secondary);
+}
+
+#report-dialog .report-dialog-input:focus {
+  border-color: var(--cookie-dialog-monster-color-primary);
+}
+
+#report-dialog .report-dialog-input:focus-visible {
+  box-shadow: initial;
+  transition: initial;
+}
+
+#report-dialog .report-dialog-input::-webkit-scrollbar {
+  display: none;
+}
+
+#report-dialog .report-dialog-input[aria-invalid='true'] {
+  border-color: var(--cookie-dialog-monster-color-error);
+}
+
+#report-dialog .report-dialog-input[aria-invalid='true'] + .report-dialog-input-error {
+  visibility: visible;
+}
+
+#report-dialog .report-dialog-input[aria-multiline='false'] {
+  -ms-overflow-style: none;
   display: flex;
-  flex-direction: column;
-  gap: 18px;
+  height: 40px;
+  overflow-x: auto;
+  scrollbar-width: none;
+  text-wrap: nowrap;
 }
 
-.report-dialog-issue-button,
-.report-dialog-submit-button {
+#report-dialog .report-dialog-input[aria-multiline='true'] {
+  -ms-overflow-style: none;
+  height: 120px;
+  overflow-y: auto;
+  scrollbar-width: none;
+}
+
+#report-dialog .report-dialog-input-error {
+  color: var(--cookie-dialog-monster-color-error);
+  font-family: Inter, Arial, Helvetica, sans-serif;
+  font-size: 10px;
+  line-height: 1.2;
+  visibility: hidden;
+}
+
+#report-dialog .report-dialog-input-group {
+  display: grid;
+  gap: 4px;
+}
+
+#report-dialog .report-dialog-input-label {
+  color: var(--cookie-dialog-monster-color-secondary);
+  font-family: Inter, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  line-height: 1.2;
+}
+
+#report-dialog .report-dialog-input-label-required {
+  color: var(--cookie-dialog-monster-color-error);
+}
+
+#report-dialog .report-dialog-issue-button,
+#report-dialog .report-dialog-submit-button {
   align-items: center;
   background-color: var(--cookie-dialog-monster-color-secondary);
   border: 1px solid var(--cookie-dialog-monster-color-secondary);
@@ -177,52 +215,52 @@
   font-size: 14px;
   height: 39px;
   justify-content: center;
+  line-height: 1.2;
   outline: none;
   padding: 8px 16px;
   text-align: center;
-  transition: 0.4s;
   width: 100%;
 }
 
-.report-dialog-issue-button:focus,
-.report-dialog-issue-button:hover,
-.report-dialog-submit-button:focus,
-.report-dialog-submit-button:hover {
+#report-dialog .report-dialog-issue-button:focus,
+#report-dialog .report-dialog-issue-button:hover,
+#report-dialog .report-dialog-submit-button:focus,
+#report-dialog .report-dialog-submit-button:hover {
   background-color: var(--cookie-dialog-monster-color-white);
   color: var(--cookie-dialog-monster-color-secondary);
 }
 
-.report-dialog-issue-button:focus-visible,
-.report-dialog-submit-button:focus-visible {
+#report-dialog .report-dialog-issue-button:focus-visible,
+#report-dialog .report-dialog-submit-button:focus-visible {
   box-shadow: initial;
   transition: initial;
 }
 
-.report-dialog-issue-button[aria-disabled='true'],
-.report-dialog-submit-button[aria-disabled='true'] {
+#report-dialog .report-dialog-issue-button[aria-disabled='true'],
+#report-dialog .report-dialog-submit-button[aria-disabled='true'] {
   background-color: var(--cookie-dialog-monster-color-tertiary);
   border: 1px solid var(--cookie-dialog-monster-color-tertiary);
   color: var(--cookie-dialog-monster-color-white);
   cursor: not-allowed;
 }
 
-.report-dialog-submit-extra-text {
+#report-dialog .report-dialog-submit-extra-text {
   font-family: inherit;
   font-size: 14px;
-  line-height: 16px;
+  line-height: 1.2;
   margin: 0px;
   text-align: justify;
 }
 
-.report-dialog-submit-text {
+#report-dialog .report-dialog-submit-text {
   font-family: inherit;
   font-size: 18px;
-  line-height: 20px;
+  line-height: 1.2;
   margin: 0px;
   text-align: center;
 }
 
-.report-dialog-submit-view {
+#report-dialog .report-dialog-submit-view {
   align-items: center;
   display: flex;
   flex-direction: column;
@@ -232,6 +270,6 @@
   margin-top: 16px;
 }
 
-.report-dialog-submit-view[hidden] {
+#report-dialog .report-dialog-submit-view[hidden] {
   display: none;
 }

From d07df6cde218ad2888cff3a92fda88b63cf951f9 Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Sun, 25 Aug 2024 13:56:00 +0200
Subject: [PATCH 2/6] chore(browser-extension): upgrade manifest version

---
 packages/browser-extension/src/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser-extension/src/manifest.json b/packages/browser-extension/src/manifest.json
index 882b8d2..599b7a8 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.1.5",
+  "version": "7.2.0",
   "default_locale": "en",
   "description": "__MSG_appDesc__",
   "icons": {

From ab79baed415d6d2b8d0c2b4d575c949ab930cd02 Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Sun, 25 Aug 2024 16:11:26 +0200
Subject: [PATCH 3/6] refactor(browser-extension): move containers logic to
 database

---
 database.json                                 | 12 ++++++++
 .../browser-extension/src/scripts/content.js  | 30 ++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/database.json b/database.json
index 5a0e33e..f65e384 100644
--- a/database.json
+++ b/database.json
@@ -1502,6 +1502,18 @@
       "xh-scroll-disabled",
       "xh-thumb-disabled"
     ],
+    "containers": [
+      ".container",
+      ".layout",
+      ".page",
+      ".wrapper",
+      "#__next",
+      "#a-page",
+      "#app",
+      "#main",
+      "#root",
+      "body > *"
+    ],
     "selectors": [
       ".___eucookiePopup",
       ".__cookie_policy",
diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js
index b277a5f..a7df810 100644
--- a/packages/browser-extension/src/scripts/content.js
+++ b/packages/browser-extension/src/scripts/content.js
@@ -3,7 +3,7 @@
  * @property {string[]} commonWords
  * @property {Fix[]} fixes
  * @property {{ domains: string[], tags: string[] }} skips
- * @property {{ backdrops: string[], classes: string[], selectors: string[] }} tokens
+ * @property {{ backdrops: string[], classes: string[], containers: string[], selectors: string[] }} tokens
  */
 
 /**
@@ -16,6 +16,7 @@
 
 /**
  * @typedef {Object} RunParams
+ * @property {HTMLElement[]} [containers]
  * @property {HTMLElement[]} [elements]
  * @property {boolean} [skipMatch]
  */
@@ -402,20 +403,11 @@ function run(params = {}) {
       clean(params.elements, params.skipMatch);
     }
 
-    if (params.elements === undefined) {
-      // 2024-08-03: look into the first level of important nodes, there are dialogs there very often
+    if (params.elements === undefined && params.containers?.length) {
       clean(
-        [
-          ...document.body.children,
-          ...[...(document.getElementsByClassName('container')[0]?.children ?? [])],
-          ...[...(document.getElementsByClassName('layout')[0]?.children ?? [])],
-          ...[...(document.getElementsByClassName('page')[0]?.children ?? [])],
-          ...[...(document.getElementsByClassName('wrapper')[0]?.children ?? [])],
-          ...[...(document.getElementById('__next')?.children ?? [])],
-          ...[...(document.getElementById('app')?.children ?? [])],
-          ...[...(document.getElementById('main')?.children ?? [])],
-          ...[...(document.getElementById('root')?.children ?? [])],
-        ].flatMap((node) => filterNodeEarly(node))
+        params.containers
+          .flatMap((container) => document.querySelector(container).children)
+          .flatMap((node) => filterNodeEarly(node))
       );
     }
   }
@@ -446,7 +438,7 @@ async function setUp(params = {}) {
     observer.observe(document.body ?? document.documentElement, options);
 
     if (!params.skipRunFn) {
-      run();
+      run({ containers: tokens.containers });
     }
   } else {
     dispatch({ type: 'DISABLE_ICON' });
@@ -482,7 +474,11 @@ browser.runtime.onMessage.addListener(async (message) => {
     }
     case 'RUN': {
       await setUp({ skipRunFn: true });
-      run(removables.length ? { elements: removables, skipMatch: true } : {});
+      run(
+        removables.length
+          ? { elements: removables, skipMatch: true }
+          : { containers: tokens.containers }
+      );
       break;
     }
   }
@@ -508,7 +504,7 @@ window.addEventListener('DOMContentLoaded', async () => {
 window.addEventListener('pageshow', async (event) => {
   if (document.visibilityState === 'visible' && event.persisted) {
     await setUp();
-    run();
+    run({ containers: tokens.containers });
   }
 });
 

From 2059638c9004342d462be15ecdf801ae943574bf Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Mon, 26 Aug 2024 12:16:20 +0200
Subject: [PATCH 4/6] fix(database): issue #850

---
 database.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/database.json b/database.json
index f65e384..1b51b3d 100644
--- a/database.json
+++ b/database.json
@@ -1036,6 +1036,25 @@
         ],
         "urlFilter": "||webtools.europa.eu/js/webtools.cck.js^"
       }
+    },
+    {
+      "id": 25,
+      "priority": 1,
+      "action": {
+        "type": "block"
+      },
+      "condition": {
+        "resourceTypes": [
+          "font",
+          "image",
+          "media",
+          "object",
+          "script",
+          "stylesheet",
+          "xmlhttprequest"
+        ],
+        "urlFilter": "||widgets.marketcat.net^"
+      }
     }
   ],
   "skips": {

From c9e8f7239990c224335de2b2ba55b2cc245bef01 Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Sat, 31 Aug 2024 09:28:23 +0200
Subject: [PATCH 5/6] feat(browser-extension): update translations

---
 .../src/_locales/de/messages.json             | 43 +++++++--------
 .../src/_locales/en/messages.json             | 27 ++++-----
 .../src/_locales/es/messages.json             | 39 ++++++-------
 .../src/_locales/fr/messages.json             | 45 +++++++--------
 .../src/_locales/it/messages.json             | 47 ++++++++--------
 .../src/_locales/pl/messages.json             | 55 +++++++++----------
 .../src/_locales/pt_BR/messages.json          | 39 ++++++-------
 .../src/_locales/pt_PT/messages.json          | 45 +++++++--------
 .../src/_locales/ro/messages.json             | 55 +++++++++----------
 .../src/_locales/ru/messages.json             | 37 ++++++-------
 10 files changed, 201 insertions(+), 231 deletions(-)

diff --git a/packages/browser-extension/src/_locales/de/messages.json b/packages/browser-extension/src/_locales/de/messages.json
index 40a242e..67a465f 100644
--- a/packages/browser-extension/src/_locales/de/messages.json
+++ b/packages/browser-extension/src/_locales/de/messages.json
@@ -1,15 +1,15 @@
 {
   "appDesc": {
-    "message": "Hat jemand Dialoge zur Cookie-Zustimmung gesagt? 😋"
+    "message": "Hat jemand Cookie-Einwilligungsdialoge gesagt? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Folgen Sie diesem Problem in GitHub"
+    "message": "Folgen Sie diesem Problem auf GitHub"
   },
   "contextMenu_reportOption": {
     "message": "Diese Website melden"
   },
   "contextMenu_settingsOption": {
-    "message": "Ausnahmeliste verwalten"
+    "message": "Ausschlussliste verwalten"
   },
   "options_addButton": {
     "message": "Ausschluss hinzufügen"
@@ -27,13 +27,13 @@
     "message": "Liste exportieren"
   },
   "options_filterPlaceholder": {
-    "message": "Nach dem Eintippen ENTER drücken, um zu filtern"
+    "message": "Drücken Sie ENTER, um nach dem Tippen zu filtern"
   },
   "options_importButton": {
     "message": "Liste importieren"
   },
   "popup_contributeOption": {
-    "message": "Tragen Sie zu diesem Projekt bei"
+    "message": "Zu diesem Projekt beitragen"
   },
   "popup_databaseVersion": {
     "message": "Datenbankversion"
@@ -45,33 +45,30 @@
     "message": "Hilfe oder Probleme?"
   },
   "popup_rateOption": {
-    "message": "Diese Erweiterung bewerten"
-  },
-  "reportDialog_blankPageOption": {
-    "message": "Seite ist leer"
+    "message": "Bewerten Sie diese Erweiterung"
   },
   "reportDialog_bodyText": {
-    "message": "Bitte wählen Sie unten eine Option aus"
+    "message": "Bitte geben Sie in diesem Bericht keine persönlichen Informationen weiter. Wenn Sie weitere Details hinzufügen möchten, öffnen Sie das GitHub-Problem im nächsten Schritt und fügen Sie einen Kommentar hinzu."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Kann nicht klicken"
+  "reportDialog_reasonInputError": {
+    "message": "Bitte geben Sie einen Grund mit mindestens 10 und höchstens 1000 Zeichen ein"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "Seite ist verzögert"
+  "reportDialog_reasonInputLabel": {
+    "message": "Grund"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "Seite antwortet nicht"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "Seite enthält visuelle Störungen"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "Popup ist aufgetaucht"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Popup ist erschienen"
   },
   "reportDialog_submitExtraText": {
-    "message": "Während wir daran arbeiten, können Sie diese Website zur Ausschlussliste in den Erweiterungseinstellungen hinzufügen oder die Erweiterung für diese Website einfach deaktivieren, indem Sie auf das Erweiterungssymbol in Ihrer Browser-Symbolleiste klicken"
+    "message": "Während wir daran arbeiten, können Sie diese Website zur Ausschlussliste in den Erweiterungseinstellungen hinzufügen oder einfach die Erweiterung für diese Website deaktivieren, indem Sie auf das Erweiterungssymbol in Ihrer Browser-Symbolleiste klicken."
   },
   "reportDialog_submitText": {
     "message": "Bericht gesendet!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Bitte geben Sie eine gültige URL mit höchstens 1000 Zeichen ein"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/en/messages.json b/packages/browser-extension/src/_locales/en/messages.json
index 18a0e5e..f55a197 100644
--- a/packages/browser-extension/src/_locales/en/messages.json
+++ b/packages/browser-extension/src/_locales/en/messages.json
@@ -47,25 +47,16 @@
   "popup_rateOption": {
     "message": "Rate this extension"
   },
-  "reportDialog_blankPageOption": {
-    "message": "Page is blank"
-  },
   "reportDialog_bodyText": {
-    "message": "Please select an option below"
+    "message": "Please, do not share any personal information in this report. If you want to add more details, open the GitHub issue in the next step and add a comment."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Cannot click"
+  "reportDialog_reasonInputError": {
+    "message": "Please enter a reason with at least 10 characters and no more than 1000 characters"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "Page is laggy"
+  "reportDialog_reasonInputLabel": {
+    "message": "Reason"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "Page is not responding"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "Page contains visual glitches"
-  },
-  "reportDialog_popupShowUpOption": {
+  "reportDialog_reasonInputPlaceholder": {
     "message": "Popup showed up"
   },
   "reportDialog_submitExtraText": {
@@ -73,5 +64,11 @@
   },
   "reportDialog_submitText": {
     "message": "Report sent!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Please enter a valid URL with no more than 1000 characters"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/es/messages.json b/packages/browser-extension/src/_locales/es/messages.json
index c874deb..efd176f 100644
--- a/packages/browser-extension/src/_locales/es/messages.json
+++ b/packages/browser-extension/src/_locales/es/messages.json
@@ -1,6 +1,6 @@
 {
   "appDesc": {
-    "message": "¿Alguien dijo diálogos de consentimiento de cookies? 😋"
+    "message": "¿Alguien mencionó los diálogos de consentimiento de cookies? 😋"
   },
   "contextMenu_issueOption": {
     "message": "Sigue este problema en GitHub"
@@ -15,7 +15,7 @@
     "message": "Agregar exclusión"
   },
   "options_addPrompt": {
-    "message": "Ingrese el dominio"
+    "message": "Ingrese dominio"
   },
   "options_clearButton": {
     "message": "Borrar lista"
@@ -33,7 +33,7 @@
     "message": "Importar lista"
   },
   "popup_contributeOption": {
-    "message": "Contribuye a este proyecto"
+    "message": "Contribuir a este proyecto"
   },
   "popup_databaseVersion": {
     "message": "Versión de la base de datos"
@@ -47,31 +47,28 @@
   "popup_rateOption": {
     "message": "Califica esta extensión"
   },
-  "reportDialog_blankPageOption": {
-    "message": "La página está en blanco"
-  },
   "reportDialog_bodyText": {
-    "message": "Por favor selecciona una opción"
+    "message": "Por favor, no compartas ninguna información personal en este informe. Si deseas agregar más detalles, abre el problema de GitHub en el siguiente paso y agrega un comentario."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "No se puede hacer clic"
+  "reportDialog_reasonInputError": {
+    "message": "Por favor, ingrese una razón con al menos 10 caracteres y no más de 1000 caracteres"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "La página tarda mucho en cargar"
+  "reportDialog_reasonInputLabel": {
+    "message": "Razón"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "La página no responde"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "La página está mal visualmente"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "Ha aparecido un diálogo"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Apareció un popup"
   },
   "reportDialog_submitExtraText": {
-    "message": "Mientras trabajamos en esto, puedes agregar este sitio web a la lista de exclusión en la configuración de la extensión o simplemente deshabilitar la extensión para este sitio web haciendo clic en el ícono de la extensión en la barra de herramientas de tu navegador"
+    "message": "Mientras trabajamos en esto, puedes agregar este sitio web a la lista de exclusión en la configuración de la extensión o simplemente deshabilitar la extensión para este sitio web haciendo clic en el ícono de la extensión en la barra de herramientas de tu navegador."
   },
   "reportDialog_submitText": {
-    "message": "¡Reporte enviado!"
+    "message": "¡Informe enviado!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Por favor, ingrese una URL válida con no más de 1000 caracteres"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/fr/messages.json b/packages/browser-extension/src/_locales/fr/messages.json
index 1e1369b..501539a 100644
--- a/packages/browser-extension/src/_locales/fr/messages.json
+++ b/packages/browser-extension/src/_locales/fr/messages.json
@@ -1,9 +1,9 @@
 {
   "appDesc": {
-    "message": "Quelqu'un a-t-il dit boîtes de dialogue de consentement aux cookies? 😋"
+    "message": "Quelqu'un a parlé de boîtes de dialogue de consentement aux cookies ? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Suivez ce problème sur GitHub"
+    "message": "Suivre ce problème sur GitHub"
   },
   "contextMenu_reportOption": {
     "message": "Signaler ce site web"
@@ -18,7 +18,7 @@
     "message": "Entrez le domaine"
   },
   "options_clearButton": {
-    "message": "Effacer la liste"
+    "message": "Vider la liste"
   },
   "options_exclusionListTitle": {
     "message": "Liste d'exclusion"
@@ -27,13 +27,13 @@
     "message": "Exporter la liste"
   },
   "options_filterPlaceholder": {
-    "message": "Appuyez sur ENTRÉE pour filtrer après avoir tapé"
+    "message": "Appuyez sur ENTRER pour filtrer après la saisie"
   },
   "options_importButton": {
     "message": "Importer la liste"
   },
   "popup_contributeOption": {
-    "message": "Contribuez à ce projet"
+    "message": "Contribuer à ce projet"
   },
   "popup_databaseVersion": {
     "message": "Version de la base de données"
@@ -42,36 +42,33 @@
     "message": "Version de l'extension"
   },
   "popup_helpOption": {
-    "message": "Aide ou problèmes?"
+    "message": "Besoin d'aide ou des problèmes?"
   },
   "popup_rateOption": {
-    "message": "Évaluez cette extension"
-  },
-  "reportDialog_blankPageOption": {
-    "message": "La page est vide"
+    "message": "Évaluer cette extension"
   },
   "reportDialog_bodyText": {
-    "message": "Veuillez sélectionner une option ci-dessous"
+    "message": "Veuillez ne pas partager d'informations personnelles dans ce rapport. Si vous souhaitez ajouter plus de détails, ouvrez le problème GitHub à l'étape suivante et ajoutez un commentaire."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Impossible de cliquer"
+  "reportDialog_reasonInputError": {
+    "message": "Veuillez entrer une raison d'au moins 10 caractères et de pas plus de 1000 caractères"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "La page est lente"
+  "reportDialog_reasonInputLabel": {
+    "message": "Raison"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "La page ne répond pas"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "La page contient des problèmes visuels"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "La fenêtre contextuelle s'est affichée"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Le popup est apparu"
   },
   "reportDialog_submitExtraText": {
-    "message": "Pendant que nous travaillons sur cela, vous pouvez ajouter ce site Web à la liste d'exclusion dans les paramètres de l'extension ou simplement désactiver l'extension pour ce site Web en cliquant sur l'icône de l'extension dans la barre d'outils de votre navigateur"
+    "message": "Pendant que nous travaillons sur ce point, vous pouvez ajouter ce site web à la liste d'exclusion dans les paramètres de l'extension ou simplement désactiver l'extension pour ce site web en cliquant sur l'icône de l'extension dans la barre d'outils de votre navigateur."
   },
   "reportDialog_submitText": {
     "message": "Rapport envoyé!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Veuillez entrer une URL valide de pas plus de 1000 caractères"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/it/messages.json b/packages/browser-extension/src/_locales/it/messages.json
index 0722223..14b5aab 100644
--- a/packages/browser-extension/src/_locales/it/messages.json
+++ b/packages/browser-extension/src/_locales/it/messages.json
@@ -1,6 +1,6 @@
 {
   "appDesc": {
-    "message": "Qualcuno ha detto finestre di dialogo per il consenso ai cookie? 😋"
+    "message": "Qualcuno ha parlato di dialoghi di consenso sui cookie? 😋"
   },
   "contextMenu_issueOption": {
     "message": "Segui questo problema su GitHub"
@@ -9,28 +9,28 @@
     "message": "Segnala questo sito web"
   },
   "contextMenu_settingsOption": {
-    "message": "Gestisci elenco di esclusione"
+    "message": "Gestisci la lista di esclusione"
   },
   "options_addButton": {
     "message": "Aggiungi esclusione"
   },
   "options_addPrompt": {
-    "message": "Inserisci il dominio"
+    "message": "Inserisci dominio"
   },
   "options_clearButton": {
-    "message": "Cancella elenco"
+    "message": "Cancella lista"
   },
   "options_exclusionListTitle": {
-    "message": "Elenco di esclusione"
+    "message": "Lista di esclusione"
   },
   "options_exportButton": {
-    "message": "Esporta elenco"
+    "message": "Esporta lista"
   },
   "options_filterPlaceholder": {
     "message": "Premi INVIO per filtrare dopo aver digitato"
   },
   "options_importButton": {
-    "message": "Importa elenco"
+    "message": "Importa lista"
   },
   "popup_contributeOption": {
     "message": "Contribuisci a questo progetto"
@@ -45,33 +45,30 @@
     "message": "Aiuto o problemi?"
   },
   "popup_rateOption": {
-    "message": "Vota questa estensione"
-  },
-  "reportDialog_blankPageOption": {
-    "message": "La pagina è vuota"
+    "message": "Valuta questa estensione"
   },
   "reportDialog_bodyText": {
-    "message": "Seleziona un'opzione qui sotto"
+    "message": "Per favore, non condividere informazioni personali in questo rapporto. Se vuoi aggiungere più dettagli, apri il problema su GitHub nel passaggio successivo e aggiungi un commento."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Non è possibile cliccare"
+  "reportDialog_reasonInputError": {
+    "message": "Inserisci una motivazione con almeno 10 caratteri e non più di 1000 caratteri"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "La pagina è in ritardo"
+  "reportDialog_reasonInputLabel": {
+    "message": "Motivo"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "La pagina non risponde"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "La pagina contiene difetti visivi"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "È apparso il popup"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Popup apparso"
   },
   "reportDialog_submitExtraText": {
-    "message": "Mentre stiamo lavorando su questo, puoi aggiungere questo sito web all'elenco di esclusione nelle impostazioni dell'estensione o semplicemente disabilitare l'estensione per questo sito web facendo clic sull'icona dell'estensione nella barra degli strumenti del tuo browser"
+    "message": "Mentre lavoriamo su questo, puoi aggiungere questo sito web alla lista di esclusione nelle impostazioni dell'estensione o semplicemente disattivare l'estensione per questo sito web cliccando sull'icona dell'estensione nella barra degli strumenti del browser."
   },
   "reportDialog_submitText": {
     "message": "Rapporto inviato!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Inserisci un URL valido con non più di 1000 caratteri"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/pl/messages.json b/packages/browser-extension/src/_locales/pl/messages.json
index 9ded01a..38bc3d1 100644
--- a/packages/browser-extension/src/_locales/pl/messages.json
+++ b/packages/browser-extension/src/_locales/pl/messages.json
@@ -1,39 +1,39 @@
 {
   "appDesc": {
-    "message": "Czy ktoś wspomniał o okienkach ze zgodą na ciasteczka? 😋"
+    "message": "Czy ktoś wspomniał o dialogach zgody na pliki cookie? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Śledź to zgłoszenie na GitHubie"
+    "message": "Śledź ten problem na GitHub"
   },
   "contextMenu_reportOption": {
     "message": "Zgłoś tę stronę"
   },
   "contextMenu_settingsOption": {
-    "message": "Zarządzaj listą wyjątków"
+    "message": "Zarządzaj listą wykluczeń"
   },
   "options_addButton": {
-    "message": "Dodaj wyjątek"
+    "message": "Dodaj wykluczenie"
   },
   "options_addPrompt": {
-    "message": "Wprowadź domenę"
+    "message": "Wpisz domenę"
   },
   "options_clearButton": {
     "message": "Wyczyść listę"
   },
   "options_exclusionListTitle": {
-    "message": "Lista wyjątków"
+    "message": "Lista wykluczeń"
   },
   "options_exportButton": {
-    "message": "Wyeksportuj listę"
+    "message": "Eksportuj listę"
   },
   "options_filterPlaceholder": {
-    "message": "Po wpisaniu naciśnij ENTER, aby filtrować"
+    "message": "Naciśnij ENTER, aby filtrować po wpisaniu"
   },
   "options_importButton": {
-    "message": "Zaimportuj listę"
+    "message": "Importuj listę"
   },
   "popup_contributeOption": {
-    "message": "Weź udział w rozwoju projektu"
+    "message": "Wesprzyj ten projekt"
   },
   "popup_databaseVersion": {
     "message": "Wersja bazy danych"
@@ -42,36 +42,33 @@
     "message": "Wersja rozszerzenia"
   },
   "popup_helpOption": {
-    "message": "Potrzebujesz pomocy lub masz problem?"
+    "message": "Pomoc lub problemy?"
   },
   "popup_rateOption": {
     "message": "Oceń to rozszerzenie"
   },
-  "reportDialog_blankPageOption": {
-    "message": "Strona jest pusta"
-  },
   "reportDialog_bodyText": {
-    "message": "Wybierz rodzaj poniżej"
+    "message": "Prosimy, nie udostępniaj żadnych danych osobowych w tym raporcie. Jeśli chcesz dodać więcej szczegółów, otwórz zgłoszenie na GitHub w następnym kroku i dodaj komentarz."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Nie da się nic kliknąć"
+  "reportDialog_reasonInputError": {
+    "message": "Proszę podać powód zawierający co najmniej 10 znaków i nie więcej niż 1000 znaków"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "Strona działa wolno"
+  "reportDialog_reasonInputLabel": {
+    "message": "Powód"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "Strona nie odpowiada"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "Strona zawiera błędy w wyglądzie"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "Pojawiło się okienko"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Pojawił się popup"
   },
   "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."
+    "message": "Podczas gdy nad tym pracujemy, możesz dodać tę stronę do listy wykluczeń w ustawieniach rozszerzenia lub po prostu wyłączyć rozszerzenie dla tej strony, klikając ikonę rozszerzenia na pasku narzędzi przeglądarki."
   },
   "reportDialog_submitText": {
-    "message": "Zgłoszenie zostało wysłane!"
+    "message": "Zgłoszenie wysłane!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Proszę wprowadzić prawidłowy URL zawierający nie więcej niż 1000 znaków"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/pt_BR/messages.json b/packages/browser-extension/src/_locales/pt_BR/messages.json
index c2a0d9e..5e5ea87 100644
--- a/packages/browser-extension/src/_locales/pt_BR/messages.json
+++ b/packages/browser-extension/src/_locales/pt_BR/messages.json
@@ -1,9 +1,9 @@
 {
   "appDesc": {
-    "message": "Alguém disse diálogos de consentimento de cookies? 😋"
+    "message": "Alguém falou sobre diálogos de consentimento de cookies? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Siga esta questão no GitHub"
+    "message": "Siga este problema no GitHub"
   },
   "contextMenu_reportOption": {
     "message": "Denunciar este site"
@@ -15,7 +15,7 @@
     "message": "Adicionar exclusão"
   },
   "options_addPrompt": {
-    "message": "Digite o domínio"
+    "message": "Insira o domínio"
   },
   "options_clearButton": {
     "message": "Limpar lista"
@@ -33,7 +33,7 @@
     "message": "Importar lista"
   },
   "popup_contributeOption": {
-    "message": "Contribua para este projeto"
+    "message": "Contribuir para este projeto"
   },
   "popup_databaseVersion": {
     "message": "Versão do banco de dados"
@@ -47,31 +47,28 @@
   "popup_rateOption": {
     "message": "Avalie esta extensão"
   },
-  "reportDialog_blankPageOption": {
-    "message": "A página está em branco"
-  },
   "reportDialog_bodyText": {
-    "message": "Por favor selecione uma opção abaixo"
+    "message": "Por favor, não compartilhe nenhuma informação pessoal neste relatório. Se você quiser adicionar mais detalhes, abra o problema no GitHub na próxima etapa e adicione um comentário."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Não é possível clicar"
+  "reportDialog_reasonInputError": {
+    "message": "Por favor, insira um motivo com pelo menos 10 caracteres e no máximo 1000 caracteres"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "A página está com lag"
+  "reportDialog_reasonInputLabel": {
+    "message": "Motivo"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "A página não está respondendo"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "A página contém falhas visuais"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "Apareceu um popup"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Popup apareceu"
   },
   "reportDialog_submitExtraText": {
-    "message": "Enquanto estamos trabalhando nisso, você pode adicionar este site à lista de exclusão nas configurações da extensão ou simplesmente desativar a extensão para este site clicando no ícone da extensão na barra de ferramentas do seu navegador"
+    "message": "Enquanto estamos trabalhando nisso, você pode adicionar este site à lista de exclusão nas configurações da extensão ou simplesmente desativar a extensão para este site clicando no ícone da extensão na barra de ferramentas do navegador."
   },
   "reportDialog_submitText": {
     "message": "Relatório enviado!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Por favor, insira uma URL válida com no máximo 1000 caracteres"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/pt_PT/messages.json b/packages/browser-extension/src/_locales/pt_PT/messages.json
index c2a0d9e..46b2b18 100644
--- a/packages/browser-extension/src/_locales/pt_PT/messages.json
+++ b/packages/browser-extension/src/_locales/pt_PT/messages.json
@@ -1,21 +1,21 @@
 {
   "appDesc": {
-    "message": "Alguém disse diálogos de consentimento de cookies? 😋"
+    "message": "Alguém mencionou diálogos de consentimento de cookies? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Siga esta questão no GitHub"
+    "message": "Siga este problema no GitHub"
   },
   "contextMenu_reportOption": {
-    "message": "Denunciar este site"
+    "message": "Reportar este site"
   },
   "contextMenu_settingsOption": {
-    "message": "Gerenciar lista de exclusão"
+    "message": "Gerir lista de exclusão"
   },
   "options_addButton": {
     "message": "Adicionar exclusão"
   },
   "options_addPrompt": {
-    "message": "Digite o domínio"
+    "message": "Insira o domínio"
   },
   "options_clearButton": {
     "message": "Limpar lista"
@@ -33,10 +33,10 @@
     "message": "Importar lista"
   },
   "popup_contributeOption": {
-    "message": "Contribua para este projeto"
+    "message": "Contribuir para este projeto"
   },
   "popup_databaseVersion": {
-    "message": "Versão do banco de dados"
+    "message": "Versão da base de dados"
   },
   "popup_extensionVersion": {
     "message": "Versão da extensão"
@@ -47,31 +47,28 @@
   "popup_rateOption": {
     "message": "Avalie esta extensão"
   },
-  "reportDialog_blankPageOption": {
-    "message": "A página está em branco"
-  },
   "reportDialog_bodyText": {
-    "message": "Por favor selecione uma opção abaixo"
+    "message": "Por favor, não partilhe nenhuma informação pessoal neste relatório. Se quiser adicionar mais detalhes, abra o problema no GitHub na próxima etapa e adicione um comentário."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Não é possível clicar"
+  "reportDialog_reasonInputError": {
+    "message": "Por favor, insira um motivo com pelo menos 10 caracteres e no máximo 1000 caracteres"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "A página está com lag"
+  "reportDialog_reasonInputLabel": {
+    "message": "Motivo"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "A página não está respondendo"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "A página contém falhas visuais"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "Apareceu um popup"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "Popup apareceu"
   },
   "reportDialog_submitExtraText": {
-    "message": "Enquanto estamos trabalhando nisso, você pode adicionar este site à lista de exclusão nas configurações da extensão ou simplesmente desativar a extensão para este site clicando no ícone da extensão na barra de ferramentas do seu navegador"
+    "message": "Enquanto trabalhamos nisso, pode adicionar este site à lista de exclusão nas definições da extensão ou simplesmente desativar a extensão para este site clicando no ícone da extensão na barra de ferramentas do navegador."
   },
   "reportDialog_submitText": {
     "message": "Relatório enviado!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Por favor, insira uma URL válida com no máximo 1000 caracteres"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/ro/messages.json b/packages/browser-extension/src/_locales/ro/messages.json
index 3fcbafa..b71ebd8 100644
--- a/packages/browser-extension/src/_locales/ro/messages.json
+++ b/packages/browser-extension/src/_locales/ro/messages.json
@@ -1,36 +1,36 @@
 {
   "appDesc": {
-    "message": "A spus cineva dialoguri de consimțământ pentru cookie? 😋"
+    "message": "A menționat cineva dialogurile de consimțământ pentru cookie-uri? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Urmați această problemă pe GitHub"
+    "message": "Urmărește această problemă pe GitHub"
   },
   "contextMenu_reportOption": {
-    "message": "Raportați acest site web"
+    "message": "Raportează acest site web"
   },
   "contextMenu_settingsOption": {
-    "message": "Gestionați lista de excludere"
+    "message": "Gestionează lista de excludere"
   },
   "options_addButton": {
-    "message": "Adăugați excludere"
+    "message": "Adaugă excludere"
   },
   "options_addPrompt": {
-    "message": "Introduceți domeniul"
+    "message": "Introdu domeniul"
   },
   "options_clearButton": {
-    "message": "Ștergeți lista"
+    "message": "Golește lista"
   },
   "options_exclusionListTitle": {
-    "message": "Listă de excludere"
+    "message": "Lista de excludere"
   },
   "options_exportButton": {
-    "message": "Exportați lista"
+    "message": "Exportă lista"
   },
   "options_filterPlaceholder": {
-    "message": "Apăsați ENTER pentru a filtra după ce ați tastat"
+    "message": "Apasă ENTER pentru a filtra după tastare"
   },
   "options_importButton": {
-    "message": "Importați lista"
+    "message": "Importă lista"
   },
   "popup_contributeOption": {
     "message": "Contribuie la acest proiect"
@@ -45,33 +45,30 @@
     "message": "Ajutor sau probleme?"
   },
   "popup_rateOption": {
-    "message": "Evaluați această extensie"
-  },
-  "reportDialog_blankPageOption": {
-    "message": "Pagina este goală"
+    "message": "Evaluează această extensie"
   },
   "reportDialog_bodyText": {
-    "message": "Vă rugăm să selectați o opțiune de mai jos"
+    "message": "Te rugăm să nu împărtășești informații personale în acest raport. Dacă dorești să adaugi mai multe detalii, deschide problema GitHub în pasul următor și adaugă un comentariu."
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Nu se poate face clic"
+  "reportDialog_reasonInputError": {
+    "message": "Vă rugăm să introduceți un motiv cu cel puțin 10 caractere și maximum 1000 de caractere"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "Pagina este întârziată"
+  "reportDialog_reasonInputLabel": {
+    "message": "Motiv"
   },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "Pagina nu răspunde"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "Pagina conține erori vizuale"
-  },
-  "reportDialog_popupShowUpOption": {
-    "message": "A apărut o fereastră pop-up"
+  "reportDialog_reasonInputPlaceholder": {
+    "message": "A apărut un popup"
   },
   "reportDialog_submitExtraText": {
-    "message": "În timp ce lucrăm la acest lucru, puteți adăuga acest site web la lista de excludere în setările extensiei sau pur și simplu dezactivați extensia pentru acest site web făcând clic pe iconița extensiei din bara de instrumente a browserului dvs"
+    "message": "În timp ce lucrăm la acest aspect, poți adăuga acest site web la lista de excludere din setările extensiei sau poți dezactiva extensia pentru acest site web făcând clic pe pictograma extensiei din bara de instrumente a browserului."
   },
   "reportDialog_submitText": {
     "message": "Raport trimis!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Vă rugăm să introduceți o adresă URL validă cu maximum 1000 de caractere"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }
diff --git a/packages/browser-extension/src/_locales/ru/messages.json b/packages/browser-extension/src/_locales/ru/messages.json
index 61fe319..186abbb 100644
--- a/packages/browser-extension/src/_locales/ru/messages.json
+++ b/packages/browser-extension/src/_locales/ru/messages.json
@@ -1,12 +1,12 @@
 {
   "appDesc": {
-    "message": "Кто-то сказал диалоги согласия на использование файлов cookie? 😋"
+    "message": "Кто-то сказал диалоги согласия на использование cookie? 😋"
   },
   "contextMenu_issueOption": {
-    "message": "Следите за этим вопросом в GitHub"
+    "message": "Следить за этим вопросом на GitHub"
   },
   "contextMenu_reportOption": {
-    "message": "Сообщить об этом веб-сайте"
+    "message": "Сообщить об этом сайте"
   },
   "contextMenu_settingsOption": {
     "message": "Управление списком исключений"
@@ -33,7 +33,7 @@
     "message": "Импорт списка"
   },
   "popup_contributeOption": {
-    "message": "Внести свой вклад в этот проект"
+    "message": "Содействовать этому проекту"
   },
   "popup_databaseVersion": {
     "message": "Версия базы данных"
@@ -48,30 +48,27 @@
     "message": "Оцените это расширение"
   },
   "reportDialog_bodyText": {
-    "message": "Выберите вариант ниже"
+    "message": "Пожалуйста, не делитесь личной информацией в этом отчете. Если вы хотите добавить больше деталей, откройте вопрос на GitHub на следующем шаге и добавьте комментарий."
   },
-  "reportDialog_blankPageOption": {
-    "message": "Страница пуста"
+  "reportDialog_reasonInputError": {
+    "message": "Пожалуйста, введите причину длиной не менее 10 и не более 1000 символов"
   },
-  "reportDialog_cannotClickOption": {
-    "message": "Невозможно нажать"
+  "reportDialog_reasonInputLabel": {
+    "message": "Причина"
   },
-  "reportDialog_laggyPageOption": {
-    "message": "Страница тормозит"
-  },
-  "reportDialog_pageNotRespondingOption": {
-    "message": "Страница не отвечает"
-  },
-  "reportDialog_pageVisualGlitchOption": {
-    "message": "Страница содержит визуальные сбои"
-  },
-  "reportDialog_popupShowUpOption": {
+  "reportDialog_reasonInputPlaceholder": {
     "message": "Появилось всплывающее окно"
   },
   "reportDialog_submitExtraText": {
-    "message": "Пока мы над этим работаем, вы можете добавить этот сайт в список исключений в настройках расширения или просто отключить расширение для этого сайта, щелкнув по иконке расширения на панели инструментов вашего браузера)"
+    "message": "Пока мы работаем над этим, вы можете добавить этот сайт в список исключений в настройках расширения или просто отключить расширение для этого сайта, нажав на значок расширения на панели инструментов вашего браузера."
   },
   "reportDialog_submitText": {
     "message": "Отчет отправлен!"
+  },
+  "reportDialog_urlInputError": {
+    "message": "Пожалуйста, введите корректный URL длиной не более 1000 символов"
+  },
+  "reportDialog_urlInputLabel": {
+    "message": "URL"
   }
 }

From f9f6b2635aa7813e47dc59d0ef3f167b0c667492 Mon Sep 17 00:00:00 2001
From: wanhose <hello@wanhose.dev>
Date: Sat, 31 Aug 2024 09:51:55 +0200
Subject: [PATCH 6/6] fix(database): issue #869

---
 database.json | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/database.json b/database.json
index 54fb373..596b002 100644
--- a/database.json
+++ b/database.json
@@ -7510,23 +7510,6 @@
       "[src=\"https://www.tumblr.com/dashboard/iframe/consent\"]",
       "[style*=\"bg_cookies.jpg\"]",
       "[style*=\"cookie-consent-zindex\"]",
-      "[style*=\"opacity: 1; x: 1px; y: 0px; transform: translateY(0px) scale(1, 1); --Toaster-indicatorColor:#\"]",
-      "[style^=\"border: 10px solid rgb(138, 138, 138);\"]",
-      "[style^=\"bottom: 0px; height: 1px; left: 0px;\"]",
-      "[style^=\"position: fixed; bottom: 0px; z-index: 10000;\"]",
-      "[style^=\"position: fixed; left:0; right:0; bottom:0;\"]",
-      "[style^=\"position: fixed; left:0; right:0; bottom:0\"]",
-      "[style=\"background: rgba(0, 0, 0, 0.38); backdrop-filter: blur(2px); position: fixed; inset: 0px; z-index: 999999; pointer-events: all; display: block; filter: none; max-width: 100vw; max-height: 100vh;\"]",
-      "[style=\"background:#2A2A2A; color: #fff; left:0px; bottom:0px; right:0px; position: fixed; z-index: 1000;\"]",
-      "[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=\"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);\"]",
-      "[style=\"position: fixed; left: 0px; top: 0px; width: 100%; height: 100%; z-index: 9999; background-color: rgba(0, 0, 0, 0.3);\"]",
-      "[style=\"position: fixed; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.4); z-index: 2147483647; top: 0px; left: 0px;\"]",
-      "[style=\"position: fixed; z-index: 9999; width: 100%; height: 100%; inset: 0px; background-color: rgba(0, 0, 0, 0.5);\"]",
       "[tile-id=\"gdpr-banner\"]",
       "[title*=\"Antes de\"][aria-modal=\"true\"][role=\"dialog\"]",
       "[title*=\"Avant d'accéder\"][aria-modal=\"true\"][role=\"dialog\"]",