From cf72cb5a449525c581ffbb2dad715d2be5d111bb Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Mon, 16 Oct 2023 19:25:21 +0200
Subject: [PATCH] Add files via upload

---
 .../XYZPrepareFilters.py                      | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 3485da976..de222d529 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -4385,9 +4385,9 @@ if __name__ == "__main__":
 SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion%20Sprout\'s%20Anti-Malware%20List.txt']
 
 UNSUPPORTED_ABP = ['$important', ',important' '$redirect=', ',redirect=',
-    ':style', '##+js', '.*#' , ':xpath', ':matches-css', 'dk,no##', 'version.bind', 'pizzaseo.com', 'gamecopyworld', '$app']
-UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$', '/^', 'version.bind', 'pizzaseo.com', 'gamecopyworld', ':  ', 'duckdns.org']
-UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#', '/^', 'gamecopyworld', '://']
+    ':style', '##+js', '.*#' , ':xpath', ':matches-css', 'dk,no##', 'version.bind', 'pizzaseo.com', 'gamecopyworld', '$app', '$dnstype']
+UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$', '/^', 'version.bind', 'pizzaseo.com', 'gamecopyworld', ':  ', 'duckdns.org', '$dnstype']
+UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#', '/^', 'gamecopyworld', '://', '$dnstype']
 UNSUPPORTED_HOSTS = ['##', '#@#', '#?#', '@@', '!#', '[Adblock Plus 3.', '*', '/^', '://', 'duckdns.org']
 UNSUPPORTED_AGH = ['$redirect=', ',redirect=',
     '##', '.*#' , '#?#', 'gamecopyworld', 'version.bind', 'hostname.bind', '|id.server|', '$app']
@@ -4625,6 +4625,12 @@ def prepare_ag(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r".*\$dnstype.*", 
+           r"", 
+           line
+        )
+
         text += line + '\n'
 
     return text
@@ -5359,6 +5365,12 @@ def prepare_tpl(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r".* (cisco|cloudflare)\.com$", 
+           r"", 
+           line
+        )
+
         if is_supported_tpl(line):
             text += line + '\n'
 
@@ -5502,7 +5514,7 @@ def prepare_privoxy(lines) -> str:
         )
 
         line = re.sub(
-           r"^\.amazonaws.*", 
+           r"^\.(amazonaws|cisco|cloudflare).*", 
            r"", 
            line
         )
@@ -5907,6 +5919,18 @@ def prepare_domains(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"^[0-9].*:.*", 
+           r"", 
+           line
+        )
+
+        line = re.sub(
+           r"^([0-9.]{7,15})\^$", 
+           r"\1", 
+           line
+        )
+
         if is_supported_domains(line):
          text += line + '\n'