From 1ad98d9c2669e32579ad2e6f97b023ae8af2f0dd Mon Sep 17 00:00:00 2001
From: Imre Eilertsen <imreeil42@gmail.com>
Date: Sat, 3 May 2025 23:03:54 +0200
Subject: [PATCH] Add files via upload

---
 .../NordicFiltersAdGuard.txt                  | 19 +++++++++----------
 .../XYZPrepareFilters.py                      | 16 ++--------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt
index 14d3bd7cb..b16904270 100644
--- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
+++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt	
@@ -1,6 +1,6 @@
 ! Title: 🏔️ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard)
 ! Title 🇬🇧: Dandelion Sprout's Nordic filters for tidier websites
-! Last modified: 02May2025v2
+! Last modified: 03May2025v2
 ! Expires: 18 hours
 ! Lisens / Licence: https://github.com/DandelionSprout/adfilt/blob/master/LICENSE.md
 ! Homepage: https://github.com/DandelionSprout/adfilt/blob/master/Wiki/General-info.md
@@ -2147,7 +2147,7 @@ baadmagasinet.dk##.article-bottom .qx-inner > .qx-section:last-of-type
 ! politikenDK (08/02/2025)
 ||65.21.200.49^$all
 !+ PLATFORM(windows, mac, android)
-65.21.200.49*$network
+65.21.200.49$network
 
 ! 🇳🇴/🇩🇰: ——— Sporingsfiler ———
 ! 🇳🇴🏞: ——— Sporingsfilar ———
@@ -2921,10 +2921,8 @@ triplx.dk##.aff-inner-col
 !+ PLATFORM(windows, mac, android)
 132.148.220.142$network
 !+ NOT_OPTIMIZED
-!+ PLATFORM(windows, mac, android)
-104.160.10.*$network
-!+ PLATFORM(windows, mac, android)
-165.231.154.*$network
+://104.160.10.$domain=~in-addr.arpa
+://165.231.154.$domain=~in-addr.arpa
 ://167.99.196.225^
 !+ PLATFORM(windows, mac, android)
 167.99.196.225$network
@@ -2946,7 +2944,8 @@ triplx.dk##.aff-inner-col
 ! https://github.com/DandelionSprout/adfilt/discussions/932#discussioncomment-7873648
 ||monetrizer*.$all
 ://38.180.96.244^$all
-*$ipaddress=38.180.96.244
+!+ PLATFORM(windows, mac, android)
+38.180.96.244$network
 ! https://sol•no/81812194/ / https://github.com/DandelionSprout/adfilt/discussions/932#discussioncomment-10360231
 ||acc-inf.com^$all
 ||acc-ntfix.com^$all
@@ -3115,8 +3114,7 @@ triplx.dk##.aff-inner-col
 !+ PLATFORM(windows, mac, android)
 193.143.1.217$network
 !#if !ext_ublock
-!+ PLATFORM(windows, mac, android)
-193.143.1.*$network
+://193.143.1.$document
 !#endif
 ||adidasko.com^$document,domain=~en-falsk-svindelbutikk.*
 ||airmaxskobillige.com^$document,domain=~en-falsk-svindelbutikk.*
@@ -3148,7 +3146,8 @@ triplx.dk##.aff-inner-col
 ||modificationdesignate.com^$all
 ||xss.my.id^$third-party
 ||85.159.213.158^$all
-*$ipaddress=85.159.213.158
+!+ PLATFORM(windows, mac, android)
+85.159.213.158$network
 
 ! 🇬🇧: Pirate-product-selling stores registered by the serial scammers who go by the name of "xiang dao xin xi ji shu you xiang gong si".
 ||nofotballshop.com^$document
diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index fcec48900..039743316 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -42,8 +42,8 @@ def prepare_ag(lines) -> str:
         )
 
         line = re.sub(
-           r"^\*,ipaddress=(.*)$",
-           r"!+ PLATFORM(windows, mac, android)\n\1$network",
+           r"^\*\$(all,)?ipaddress=(.*)$",
+           r"!+ PLATFORM(windows, mac, android)\n\2$network",
            line
         )
 
@@ -264,24 +264,12 @@ def prepare_ag(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"^(://(\d{1,3}\.\d{1,3}\.\d{1,3}\.)(\$.*)?)$",
-           r"!+ PLATFORM(windows, mac, android)\n\2*$network",
-           line
-        )
-
         line = re.sub(
            r"^[a-zA-Z0-9*,:;^$=?!+&%#@_-]{1,5}$",
            r"",
            line
         )
 
-        line = re.sub(
-           r"^\*\$all,ipaddress=(.*[0-9])$",
-           r"!+ PLATFORM(windows, mac, android)\n\1*$network",
-           line
-        )
-
         text += line + '\n'
 
     return text