From 779a27ad74dea9a07e66f08956b2913865a2e4b5 Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Mon, 27 Sep 2021 17:31:36 +0200
Subject: [PATCH] Add files via upload

---
 .../NordicFilters-uBOLegacy.txt               | 40 +++++++++----------
 .../XYZPrepareFilters.py                      | 10 ++++-
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt
index 90e068292..9a3768496 100644
--- a/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFilters-uBOLegacy.txt	
@@ -841,20 +841,20 @@ _300x500pix$domain=rykindribe.dk,image
 ||82.221.81.9^$domain=~in-addr.arpa
 ||178.79.136.45^$domain=~in-addr.arpa
 !#if !ext_ublock
-||freewheel-mtgx-tv.akamaized.net^$app=no.viafree.android|dk.viafree.android
-||ssl-mtgstream.tns-cs.net^$app=no.viafree.android|dk.viafree.android
-||krxd.net^$app=no.viafree.android|dk.viafree.android
-||2mdn.net^$app=no.viafree.android|dk.viafree.android
-||5e529.v.fwmrm.net^$app=com.discovery.dplay
-||ssl-dnnstream.tns-cs.net^$app=com.discovery.dplay
-||discoverynordics.hb.omtrdc.net^$app=com.discovery.dplay
-||widgets.sprinklecontent.com^$app=no.startsiden.bookmarks
-/tv2ads.js$app=dk.tv2.nyhedscenter
--bazaar-$app=no.nettavisen.phonegap.na
-/bazaar/*$app=no.nettavisen.phonegap.na
-/resources/dfp/*$app=no.nettavisen.phonegap.na
-||finn.no^$app=no.bt
-contentMarketing$app=no.sol
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 !#endif
 
 ! 🇳🇴: ——— Tomme restebokser som EasyList har etterlatt ———
@@ -1921,15 +1921,15 @@ viafree.*##.pause-ad
 viafree.*##.pause-ad-container
 ||viafree.*/collect$important,xhr
 ||client-stream-events.mtg-api.com^$domain=viafree.no|viafree.dk
-||freewheel-mtgx-tv.akamaized.net^$media,mp4,domain=viafree.no|viafree.dk
+||freewheel-mtgx-tv.akamaized.net^$media,redirect=noopmp4,domain=viafree.no|viafree.dk
 @@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk
 @@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
 !#if !ext_ublock
-/insert_grtv_stats.$xhr,app=com.gamereactor
-/prerolls/*$app=com.gamereactor
-/videojs.ima.$app=com.gamereactor
-@@||imasdk.googleapis.com/js/sdkloader/ima3.$app=com.gamereactor
-@@||openx.gamereactor.dk/www/delivery/fc.php$app=com.gamereactor
+
+
+
+
+
 !#endif
 
 ! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent.
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index b83db5c1a..6c3d41454 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -2069,8 +2069,14 @@ def prepare_xul(lines) -> str:
         )
 
         line = re.sub(
-           r"\$mp4", 
-           r"$redirect=noopmp4", 
+           r"(\$|,)mp4", 
+           r"\1redirect=noopmp4", 
+           line
+        )
+
+        line = re.sub(
+           r".*(\$|,)app=.*", 
+           r"", 
            line
         )