From 97ff429aa87fc32c78572e5b265964e4807e35ab Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Mon, 11 Jan 2021 23:27:18 +0100
Subject: [PATCH] Hotfix for AdBlock

---
 .../NordicFiltersABP.txt                                    | 6 +++---
 .../XYZPrepareFilters.py                                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt
index 49a64e65a..02c6322aa 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt	
@@ -1964,13 +1964,13 @@ csp.screen9.com#@#.adsbox
 tv2.no#$#abort-current-inline-script adblockDetector
 
 ||aftenposten.no/seksjon/dist/ads-$script
-||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,rewrite=abp-resource:blank-mp3,domain=discoveryplus.*
+||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,rewrite=abp-resource:blank-mp3,domain=discoveryplus.no|discoveryplus.dk
 ||elderlyscissors.com^
-||imasdk.googleapis.com/pal/sdkloader/pal.js$script,rewrite=abp-resource:blank-js,domain=discoveryplus.*
+||imasdk.googleapis.com/pal/sdkloader/pal.js$script,rewrite=abp-resource:blank-js,domain=discoveryplus.no|discoveryplus.dk
 ||vg.no/cnp-assets/src/sites/vg/components/AdblockModal$script,~third-party
 @@.dk/assets/templates/*/ads.png^$image,domain=maskinbladet.dk|agrar-plus.dk|fritidsmarkedet.dk|dagensbyggeri.dk|maskinteknik.dk|gronteknik.dk
 @@/js/ads.js$~third-party,domain=tvkampen.com|tvsporten.dk
-@@||fwmrm.net/ad/$script,domain=discoveryplus.*
+@@||fwmrm.net/ad/$script,domain=discoveryplus.no|discoveryplus.dk
 @@||sixscissors.com^$third-party,domain=itavisen.no
 @@||www.tv2.no/s/js/ads.js$script,~third-party
 gamereactor.no,gamereactor.dk#$#abort-current-inline-script AdsReloadConfig
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 47d68c5ab..5eabc6e91 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -710,7 +710,7 @@ def prepare_abp(lines) -> str:
         )
 
         line = re.sub(
-           r"([a-z*][=|])discoveryplus\.\*\|~discoveryplus.it\|~discoveryplus.es", 
+           r"([a-z*][=|])discoveryplus\.\*(\|~discoveryplus.it\|~discoveryplus.es)?", 
            r"\1discoveryplus.no|discoveryplus.dk", 
            line
         )