From 8f4107a014085a6eeda5b7b006d71c04bd6b89cf Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Sat, 31 Oct 2020 22:58:50 +0100
Subject: [PATCH] Add files via upload

---
 .../DandelionSproutsNorskeFiltre.tpl               |  2 +-
 .../NordicFilters-uMatrixSupplement.txt            |  2 +-
 .../NordicFiltersABP-Inclusion.txt                 |  2 +-
 .../NordicFiltersABP.txt                           |  2 +-
 .../NordicFiltersAdGuard.txt                       |  3 ++-
 .../NordicFiltersPrivacy.txt                       |  3 ++-
 .../NordicFiltersPrivoxy.action                    |  2 +-
 .../XYZPrepareFilters.py                           | 14 ++++++++++----
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl
index 1ea189d50..23b304ec8 100644
--- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
+++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl	
@@ -1,5 +1,5 @@
 msFilterList
-# Version: 30October2020v3-Alpha
+# Version: 31October2020v1-Alpha
 # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider
 # Translated title: Dandelion Sprout's Nordic filters for tidier websites
 : expires = 1
diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt
index b3c08c71c..3e8567a34 100644
--- a/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFilters-uMatrixSupplement.txt	
@@ -1,4 +1,4 @@
-! Version: 30October2020v3-Alpha
+! Version: 31October2020v1-Alpha
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uMatrix-regler til å benytte sammen med domeneversjonen)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (uMatrix rules to use together with the raw domains version)
 ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt
index 1fea8dda7..c820aacbc 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt	
@@ -1,5 +1,5 @@
 [Adblock Plus 3.4]
-! Version: 301020203
+! Version: 311020201
 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for Adblock Plus - Møter ABP sine inkluderingsregler)
 ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for Adblock Plus with ABP inclusion compliance)
 ! Expires: 1 day
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt
index 7ed56f4ee..627750eac 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
@@ -1,5 +1,5 @@
 [Adblock Plus 3.4]
-! Version: 301020203
+! Version: 311020201
 ! Title: 🏔️ Dandelion Sprouts vestnordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus)
 ! Translated title: Dandelion Sprout's West Nordic filters for tidier websites (for AdBlock and Adblock Plus)
 ! Expires: 1 day
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt
index 078fc70a1..a89d228ab 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
@@ -1,4 +1,4 @@
-! Version: 30October2020v3
+! Version: 31October2020v1
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard)
 ! Expires: 1 day
@@ -552,6 +552,7 @@ _nettannonse.
 /resources/dfp/*$app=no.nettavisen.phonegap.na
 ||finn.no^$app=no.bt
 contentMarketing$app=no.sol
+||jula.no^$removeparam=gclsrc
 !#endif
 
 ! 🇳🇴: ——— Tomme restebokser som EasyList har etterlatt ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt
index 53e32bf32..8703d1815 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt	
@@ -1,4 +1,4 @@
-! Version: 30October2020v3
+! Version: 31October2020v1
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)
 ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings)
 ! Expires: 1 day
@@ -552,6 +552,7 @@ _nettannonse.
 /resources/dfp/*$app=no.nettavisen.phonegap.na
 ||finn.no^$app=no.bt
 contentMarketing$app=no.sol
+||jula.no^$removeparam=gclsrc
 !#endif
 
 ! 🇳🇴: ——— Tomme restebokser som EasyList har etterlatt ———
diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action
index 22b616e48..52c00e173 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action	
@@ -1,4 +1,4 @@
-# Version: 30October2020v3-Alpha
+# Version: 31October2020v1-Alpha
 # Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy)
 # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy)
 # Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index bbf243225..83a6eee22 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', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests']
+    ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests', '$removeparam']
 UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$']
-UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', '$generichide', '$ghide', 'Expires:']
-UNSUPPORTED_UMATRIX = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', 'generichide', 'Expires:', 'subdocument', '$app', '!+', '$doc', ' doc ', 'CSP', '$csp', 'ghide']
+UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', '$generichide', '$ghide', 'Expires:', '$removeparam']
+UNSUPPORTED_UMATRIX = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', 'generichide', 'Expires:', 'subdocument', '$app', '!+', '$doc', ' doc ', 'CSP', '$csp', 'ghide', '$removeparam']
 
 OUTPUT = 'xyzzyx.txt'
 OUTPUT_AG = 'NordicFiltersAdGuard.txt'
@@ -1162,6 +1162,12 @@ def prepare_tpl(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^-d jula\.no$", 
+           r"", 
+           line
+        )
+
         if is_supported_tpl(line) and not line == '':
             text += line + '\r\n'
 
@@ -1817,7 +1823,7 @@ import re
 SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt']
 
 UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=',
-    ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', '$csp=upgrade-insecure-requests']
+    ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', '$csp=upgrade-insecure-requests', '$removeparam']
 
 OUTPUT = 'xyzzyxeyeo.txt'
 OUTPUT_ABP = 'NordicFiltersABP-Inclusion.txt'