diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 416af74ba..113470d66 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -453,7 +453,6 @@ msFilterList +d notice.sp-prod.net +d sp-prod.net ! -!#include NorwegianExperimentalList%20alternate%20versions AntiAdblockEntries.txt ! # 🇳🇴: ——— Forsøker å få nettleseren til å laste inn filer i HTTPS, dersom nettstedet ikke automatisk omdirigerer HTTP til dens HTTPS-versjon ——— # 🇬🇧: ——— Tries to make the web browser load files in HTTPS, if the website itself doesn't automatically redirect from HTTP to its HTTPS version ——— @@ -815,7 +814,6 @@ msFilterList -d storustovu.dk -d campingnews.dk ! -!#include uBO%20list%20extensions TemporaryWaterfoxClassicFixForNordicFilters.txt   # 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— # Takk til THEtomaso (https://github.com/THEtomaso)/for/de/fleste/av/disse/oppføringene. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index 020cd3fd0..4ccd183f8 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1338,7 +1338,6 @@ in.fo#@#.ads-banner ! ——— Caused by «AdGuard Base» (Should be submitted to AdGuard Base itself at some point) —— nytid.no#@#.td-a-rec ! https://github.com/AdguardTeam/AdguardFilters/issues/68028 -||v.fwmrm.net/ad/g/1?resp=$xmlhttprequest,domain=viafree.dk,badfilter ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index a520ce9c6..f3613cba2 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1347,7 +1347,6 @@ in.fo#@#.ads-banner ! ——— Caused by «AdGuard Base» (Should be submitted to AdGuard Base itself at some point) —— nytid.no#@#.td-a-rec ! https://github.com/AdguardTeam/AdguardFilters/issues/68028 -||v.fwmrm.net/ad/g/1?resp=$xmlhttprequest,domain=viafree.dk,badfilter ! ——— Caused by «I Don't Care About Cookies» (Its maintainer couldn't reproduce it) ——— ! Fullpage uncloseable overlay when browsing around on Telenor Norway's TV section telenor.no##.global-overlay-background @@ -1362,7 +1361,6 @@ telenor.no##.global-overlay-background @@||sp-prod.net^$xmlhttprequest,domain=ekstrabladet.dk -!#include NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt @@ -1858,7 +1856,6 @@ vg.no##.advert ||campingnews.dk^ -!#include uBO%20list%20extensions/TemporaryWaterfoxClassicFixForNordicFilters.txt   ! 🇳🇴: ——— Vindusviskere for betalte artikler (sånn at de nederste linjene i en forhåndsvisning ikke toner ut) ——— ! Takk til THEtomaso (https://github.com/THEtomaso) for de fleste av disse oppføringene. diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 562b770fd..3409c1263 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -4,8 +4,8 @@ import re SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt', 'https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/AntiAdblockEntries.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', - ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests', '$removeparam'] -UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$'] + ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '$$', '$app', '$csp=upgrade-insecure-requests', '$removeparam', 'badfilter', '!#include'] +UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$', '!#include'] UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', '$generichide', '$ghide', 'Expires:', '$removeparam'] UNSUPPORTED_UMATRIX = ['##', '#@#', '#?#', '!#', '$$', '$redirect', ',redirect', 'generichide', 'Expires:', 'subdocument', '$app', '!+', '$doc', ' doc ', 'CSP', '$csp', 'ghide', '$removeparam'] @@ -1877,7 +1877,7 @@ import re SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt'] UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=', - ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', '$csp=upgrade-insecure-requests', '$removeparam'] + ':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^', '!#i', '$app', ':not(:-abp-', '$csp=upgrade-insecure-requests', '$removeparam', 'badfilter'] OUTPUT = 'xyzzyxeyeo.txt' OUTPUT_ABP = 'NordicFiltersABP-Inclusion.txt'