diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index a3ede0691..758d37a60 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1870,7 +1870,10 @@ vafo.dk##.adform-flexblock ###adBlinkContainer:not(html,body,:empty) ###innocode-ad:not(html,body,:empty) ! https://www.brannmannen.no/brann/store-utfordringer-ved-togulykken-pa-asta/ +!+ PLATFORM(windows, mac, android) 85.17.76.181$network +!+ NOT_PLATFORM(windows, mac, android) +||85.17.76.181^$all ! krs247.no ##div[id^=webbannernetboard]:not(body,:empty) ! lsk.no @@ -2006,12 +2009,30 @@ baadmagasinet.dk##.article-bottom .qx-inner > .qx-section:last-of-type ! 🇳🇴🏞: Huvudsakleg for AdGuard ! 🇮🇸: Aðallega fyrir AdGuard ! 🇬🇧: Mostly for AdGuard +!+ PLATFORM(windows, mac, android) 3.248.18.175$network +!+ NOT_PLATFORM(windows, mac, android) +||3.248.18.175^$all +!+ PLATFORM(windows, mac, android) 35.227.231.163$network +!+ NOT_PLATFORM(windows, mac, android) +||35.227.231.163^$all +!+ PLATFORM(windows, mac, android) 45.58.146.154$network +!+ NOT_PLATFORM(windows, mac, android) +||45.58.146.154^$all +!+ PLATFORM(windows, mac, android) 82.196.13.38$network +!+ NOT_PLATFORM(windows, mac, android) +||82.196.13.38^$all +!+ PLATFORM(windows, mac, android) 82.221.81.9$network +!+ NOT_PLATFORM(windows, mac, android) +||82.221.81.9^$all +!+ PLATFORM(windows, mac, android) 178.79.136.45$network +!+ NOT_PLATFORM(windows, mac, android) +||178.79.136.45^$all ! 🇳🇴/🇩🇰: ——— Sporingsfiler ——— ! 🇳🇴🏞: ——— Sporingsfilar ——— @@ -2358,8 +2379,14 @@ triplx.dk##.aff-inner-col /finn.no/finno.htm$document,domain=~facebook.com .gratis-reisebilletter.$document ||102.112.2o7.net^$document +!+ PLATFORM(windows, mac, android) 52.216.146.90$network +!+ NOT_PLATFORM(windows, mac, android) +||52.216.146.90^$all +!+ PLATFORM(windows, mac, android) 92.42.104.146$network +!+ NOT_PLATFORM(windows, mac, android) +||92.42.104.146^$all ||appleid.*.no^$domain=~en-svindelside-som-ikke-er-apple.* ||coop.no.$document,domain=~en-svindelside-som-ikke-er-coop.* ||danskebank.no.$document,domain=~en-svindelside-som-ikke-er-danskebank.* @@ -2471,7 +2498,10 @@ triplx.dk##.aff-inner-col ! E-mail tips ||s.free.fr^$all ||trmff.wpengine.com^$all +!+ PLATFORM(windows, mac, android) 212.27.60.108$network +!+ NOT_PLATFORM(windows, mac, android) +||212.27.60.108^$all ! Overly dedicated E-mail spambots ||wirexapp.africa.com^$all ||tachyoniums.eu.com^$all @@ -2700,30 +2730,81 @@ triplx.dk##.aff-inner-col ||my-altinn*$all,domain=~no ||no-oppdatere.$all ||no-oppdatert.$all,domain=~no +!+ PLATFORM(windows, mac, android) 179.43.189.62$network +!+ NOT_PLATFORM(windows, mac, android) +||179.43.189.62^$all ! https://github.com/DandelionSprout/adfilt/discussions/932#discussioncomment-7694946 ||easypark-$document,popup +!+ PLATFORM(windows, mac, android) 74.119.239.234$network +!+ NOT_PLATFORM(windows, mac, android) +||74.119.239.234^$all +!+ PLATFORM(windows, mac, android) 162.241.194.206$network +!+ NOT_PLATFORM(windows, mac, android) +||162.241.194.206^$all ! IP addresses of servers notorious for hosting many of the sites above +!+ PLATFORM(windows, mac, android) 51.195.133.131$network +!+ NOT_PLATFORM(windows, mac, android) +||51.195.133.131^$all +!+ PLATFORM(windows, mac, android) 66.206.3.34$network +!+ NOT_PLATFORM(windows, mac, android) +||66.206.3.34^$all +!+ PLATFORM(windows, mac, android) 82.118.242.69$network +!+ NOT_PLATFORM(windows, mac, android) +||82.118.242.69^$all +!+ PLATFORM(windows, mac, android) 136.243.73.30$network +!+ NOT_PLATFORM(windows, mac, android) +||136.243.73.30^$all +!+ PLATFORM(windows, mac, android) 138.201.126.227$network +!+ NOT_PLATFORM(windows, mac, android) +||138.201.126.227^$all +!+ PLATFORM(windows, mac, android) 156.236.126.173$network +!+ NOT_PLATFORM(windows, mac, android) +||156.236.126.173^$all +!+ PLATFORM(windows, mac, android) 196.196.230.76$network +!+ NOT_PLATFORM(windows, mac, android) +||196.196.230.76^$all +!+ PLATFORM(windows, mac, android) 167.71.49.177$network +!+ NOT_PLATFORM(windows, mac, android) +||167.71.49.177^$all +!+ PLATFORM(windows, mac, android) 134.209.82.119$network +!+ NOT_PLATFORM(windows, mac, android) +||134.209.82.119^$all +!+ PLATFORM(windows, mac, android) 154.213.16.136$network +!+ NOT_PLATFORM(windows, mac, android) +||154.213.16.136^$all +!+ PLATFORM(windows, mac, android) 158.247.212.220$network +!+ NOT_PLATFORM(windows, mac, android) +||158.247.212.220^$all +!+ PLATFORM(windows, mac, android) 165.227.168.212$network +!+ NOT_PLATFORM(windows, mac, android) +||165.227.168.212^$all !+ NOT_OPTIMIZED +!+ PLATFORM(windows, mac, android) 132.148.220.142$network +!+ NOT_PLATFORM(windows, mac, android) +||132.148.220.142^$all !+ NOT_OPTIMIZED -104.160.10..*$network -165.231.154..*$network +104.160.10.*$network +165.231.154.*$network +!+ PLATFORM(windows, mac, android) 167.99.196.225$network +!+ NOT_PLATFORM(windows, mac, android) +||167.99.196.225^$all ! https://github.com/DandelionSprout/adfilt/discussions/932#discussioncomment-7872103 ||betzykrisesenter.no^$document ||citra2010oslo.no^$document @@ -2741,7 +2822,10 @@ triplx.dk##.aff-inner-col ||yttersiden.no^$document ! https://github.com/DandelionSprout/adfilt/discussions/932#discussioncomment-7873648 ||monetrizer*.$all +!+ PLATFORM(windows, mac, android) 38.180.96.244$network +!+ NOT_PLATFORM(windows, mac, android) +||38.180.96.244^$all ! 🇳🇴: Falske nett-"butikker" som er så dårlige, at de står oppført på Forbrukertilsynet egen svarteliste. ! 🇩🇰: Forbrukertilsynets black-list over falske netbutikker (Norges svar på Forbrugerombudsmanden). @@ -2779,9 +2863,18 @@ triplx.dk##.aff-inner-col ||nodrakts.com^$document ||dkfodboldstore.com^$document ||vmfodboldtoj.com^$document +!+ PLATFORM(windows, mac, android) 5.39.217.206$network +!+ NOT_PLATFORM(windows, mac, android) +||5.39.217.206^$all +!+ PLATFORM(windows, mac, android) 5.39.221.180$network +!+ NOT_PLATFORM(windows, mac, android) +||5.39.221.180^$all +!+ PLATFORM(windows, mac, android) 193.148.70.153$network +!+ NOT_PLATFORM(windows, mac, android) +||193.148.70.153^$all ! 🇳🇴: Falske nettapoteker ! 🇬🇧: Fake online pharmacies @@ -2814,7 +2907,10 @@ triplx.dk##.aff-inner-col ||hagebakken.no^ ||mdb.nu^ ||idj.no^ +!+ PLATFORM(windows, mac, android) 1.14.61.188$network +!+ NOT_PLATFORM(windows, mac, android) +||1.14.61.188^$all ||smarthouseforum.ru^ ||trafikkskoleapp.no^ diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 47f750228..95be8d124 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -91,13 +91,13 @@ def prepare_ag(lines) -> str: line = re.sub( r"^\|\|(([1-2]?[0-9]?[0-9]\.?){4})\^\$.*$", - r"\1$network", + r"!+ PLATFORM(windows, mac, android)\n\1$network\n!+ NOT_PLATFORM(windows, mac, android)\n||\1^$all", line ) line = re.sub( r"^\|\|(([1-2]?[0-9]?[0-9]\.?){4})\^", - r"\1$network", + r"!+ PLATFORM(windows, mac, android)\n\1$network\n!+ NOT_PLATFORM(windows, mac, android)\n||\1^$all", line ) @@ -240,6 +240,12 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"\.\.\*\$", + r".*$", + line + ) + text += line + '\n' return text @@ -4711,7 +4717,7 @@ def prepare_ag(lines) -> str: line = re.sub( r"^\|\|(([1-2]?[0-9]?[0-9]\.?){4})\^\$.*$", - r"\1$network", + r"!+ PLATFORM(windows, mac, android)\n\1$network\n!+ NOT_PLATFORM(windows, mac, android)\n||\1^$all", line )