From 1195e778bb77cd3fab77d34cb6fcc645bed25e5e Mon Sep 17 00:00:00 2001
From: Imre Kristoffer Eilertsen <imreeil42@gmail.com>
Date: Thu, 16 Mar 2023 20:14:47 +0100
Subject: [PATCH] Add files via upload

---
 .../XYZPrepareFilters.py                      | 53 ++++++++++++++++---
 1 file changed, 45 insertions(+), 8 deletions(-)

diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py
index 4d0a56ab0..a0b59dad6 100644
--- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
+++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py	
@@ -5581,9 +5581,28 @@ def prepare_agh(lines) -> str:
     # remove or modifiy entries with unsupported modifiers
     for line in lines:
 
+        # Doesn't seem like $denyallow will be fixed in HostfilesRegistry anytime soon as of March 2023
+        #line = re.sub(
+        #   r"^(\||:)(.*)\$doc,domain=(.*)", 
+        #   r"\1\2$denyallow=\3", 
+        #   line
+        #)
+
         line = re.sub(
-           r"^(\||:)(.*)\$doc,domain=(.*)", 
-           r"\1\2$denyallow=\3", 
+           r"^(\|\|)([a-z]{1,}\^)\$doc,domain=~(.*)", 
+           r"\1\2\n@@||\3", 
+           line
+        )
+
+        line = re.sub(
+           r"^\|\|([a-z]{2,17})\^", 
+           r"||*.\1^", 
+           line
+        )
+
+        line = re.sub(
+           r".*google\.(tk|ml).*", 
+           r"", 
            line
         )
 
@@ -5593,11 +5612,11 @@ def prepare_agh(lines) -> str:
            line
         )
 
-        line = re.sub(
-           r"\|~", 
-           r"|", 
-           line
-        )
+        #line = re.sub(
+        #   r"\|~", 
+        #   r"|", 
+        #   line
+        #)
 
         line = re.sub(
            "\$doc,", 
@@ -5774,7 +5793,7 @@ def prepare_agh(lines) -> str:
         )
 
         line = re.sub(
-           r"^\|\|.*\.(ga|ml|gq|cf|pw|loan|agency|gdn|bid|top|ooo|monster)\^.*", 
+           r"^\|\|.*[a-z0-9]\.(ga|gq|cf|pw|loan|agency|gdn|bid|top|ooo|monster)\^.*", 
            r"", 
            line
         )
@@ -5878,6 +5897,24 @@ def prepare_agh(lines) -> str:
            line
         )
 
+        line = re.sub(
+           r"\|~", 
+           r"^\n@@||", 
+           line
+        )
+
+        line = re.sub(
+           r"(@@\|\|[a-z0-9.-]{1,})$", 
+           r"\1^", 
+           line
+        )
+
+        line = re.sub(
+           r"\^\^", 
+           r"^", 
+           line
+        )
+
         if is_supported_agh(line):
             text += line + '\r\n'