From 620a96531ce3ff8a36f0348fa6f36da95aab0403 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Tue, 4 Apr 2023 13:20:58 -0400
Subject: [PATCH] Report cosmetic filters as popup panel property

---
 src/js/messaging.js | 8 ++++----
 src/js/support.js   | 8 --------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/js/messaging.js b/src/js/messaging.js
index ab0f05096..5c4a0d82e 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -615,9 +615,6 @@ const onMessage = function(request, sender, callback) {
         if ( vAPI.net.hasUnprocessedRequest(request.tabId) ) {
             request.popupPanel.hasUnprocessedRequest = true;
         }
-        const supportURL = new URL(vAPI.getURL('support.html'));
-        supportURL.searchParams.set('pageURL', request.pageURL);
-        supportURL.searchParams.set('popupPanel', JSON.stringify(request.popupPanel));
         vAPI.tabs.executeScript(request.tabId, {
             allFrames: true,
             file: '/js/scriptlets/cosmetic-report.js',
@@ -628,8 +625,11 @@ const onMessage = function(request, sender, callback) {
                 return a;
             }, []);
             if ( filters.length !== 0 ) {
-                supportURL.searchParams.set('cosmetic', JSON.stringify(filters));
+                request.popupPanel.cosmetic = filters;
             }
+            const supportURL = new URL(vAPI.getURL('support.html'));
+            supportURL.searchParams.set('pageURL', request.pageURL);
+            supportURL.searchParams.set('popupPanel', JSON.stringify(request.popupPanel));
             µb.openNewTab({ url: supportURL.href, select: true, index: -1 });
         });
         return;
diff --git a/src/js/support.js b/src/js/support.js
index d31579868..3b878b035 100644
--- a/src/js/support.js
+++ b/src/js/support.js
@@ -151,9 +151,6 @@ function showData() {
     }
     if ( reportedPage !== null ) {
         shownData.popupPanel = reportedPage.popupPanel;
-        if ( reportedPage.cosmeticFilters ) {
-            shownData.cosmeticFilters = reportedPage.cosmeticFilters;
-        }
     }
     const text = JSON.stringify(shownData, null, 2)
         .split('\n')
@@ -200,14 +197,9 @@ const reportedPage = (( ) => {
             select.append(option);
         }
         dom.cl.add(dom.body, 'filterIssue');
-        let cosmeticFilters;
-        if ( url.searchParams.has('cosmetic') ) {
-            cosmeticFilters = JSON.parse(url.searchParams.get('cosmetic'));
-        }
         return {
             hostname: parsedURL.hostname.replace(/^(m|mobile|www)\./, ''),
             popupPanel: JSON.parse(url.searchParams.get('popupPanel')),
-            cosmeticFilters,
         };
     } catch(ex) {
     }