From 7995c1a0df457b05349e7f107f93b8650afedf94 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Sat, 4 Jul 2020 23:15:52 +0200
Subject: [PATCH] Fix for TPL and Privoxy

---
 .../DandelionSproutsNorskeFiltre.tpl             |  2 +-
 .../NordicFiltersABP.txt                         |  1 -
 .../NordicFiltersBrave.txt                       |  1 -
 .../NordicFiltersPrivoxy.action                  |  2 +-
 .../XYZPrepareFilters.py                         | 16 ++++++++++++++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl
index 90894f1de..a03371617 100644
--- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
+++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
@@ -571,4 +571,4 @@ msFilterList
 +d sixscissors.com
 +d bildeler.name
 +d reservedele.name
-- gamereactor.*
+-d
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt
index c6975a6c4..e62e65a06 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
@@ -1365,4 +1365,3 @@ abcnyheter.no##div[style^="bottom: 0px;"]
 @@||www.tv2.no/s/js/ads.js$script,~third-party
 @@||bildeler.name$generichide
 @@||reservedele.name$generichide
-gamereactor.*$$script[onError="adblockEnabled()"]
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt
index 60f814fe9..3f4a53d17 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt	
@@ -661,5 +661,4 @@ gamereactor.*##+js(set, trackAdblock, noopFunc)
 !#if env_firefox
 !#endif
 !#if !ext_ublock
-gamereactor.*$$script[onError="adblockEnabled()"]
 !#endif
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action
index fb15349a1..147505c6b 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
@@ -668,5 +668,5 @@ contentMarketing
 #
 #
 #
-gamereactor.*
+#
 #
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 1f0aa1169..7efb01b0b 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -4,10 +4,10 @@ import re
 SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt']
 
 UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=',
-    ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^']
+    ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$']
 UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$']
 UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#']
-UNSUPPORTED_BRAVE = ['#@#', '#?#', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn', '!+ NOT_OPTIMIZED']
+UNSUPPORTED_BRAVE = ['#@#', '#?#', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn', '!+ NOT_OPTIMIZED', '$$']
 
 OUTPUT = 'xyzzyx.txt'
 OUTPUT_AG = 'NordicFiltersAdGuard.txt'
@@ -640,6 +640,12 @@ def prepare_tpl(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r".*\$\$script.*", 
+           "-d ", 
+           line
+        )
+
         line = re.sub(
            r"^/", 
            "- ", 
@@ -1045,6 +1051,12 @@ def prepare_privoxy(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r".*\$\$script.*", 
+           r"", 
+           line
+        )
+
         line = re.sub(
            r"\$.*", 
            "",