diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt index c65e63f81..30d7035be 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt @@ -1175,7 +1175,7 @@ viafree.no,viafree.dk##.pause-ad-container ||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk @@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk -/insert_grtv_stats.$xmlhttprequest,app=com.gamereactor + ! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent. ! 🇬🇧: Entries for far-right websites. Support for these sites is limited, and most new entries that are suggested for them will be accepted verbatim. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index bfe10068b..a80f3225c 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1176,7 +1176,7 @@ viafree.no,viafree.dk##.pause-ad-container ||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk @@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk -/insert_grtv_stats.$xmlhttprequest,app=com.gamereactor + ! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent. ! 🇬🇧: Entries for far-right websites. Support for these sites is limited, and most new entries that are suggested for them will be accepted verbatim. diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt index 10c5cc940..665044cfd 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersBrave.txt @@ -436,10 +436,7 @@ gamereactor.*##+js(nano-stb) @@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk @@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk !#if !ext_ublock -/adblock_mobile.$important,app=com.gamereactor -/insert_grtv_stats.$xhr,app=com.gamereactor /prerolls/*$app=com.gamereactor -/viewability.$important,app=com.gamereactor @@||openx.gamereactor.dk/www/delivery/fc.php$app=com.gamereactor !#endif ! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent. diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index e6a7b7d8e..d317a09a6 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -608,6 +608,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r".*\$.*,app=.*", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -1325,6 +1331,12 @@ def prepare_brave(lines) -> str: line ) + line = re.sub( + r".*\$.*,app=.*", + r"", + line + ) + if is_supported_brave(line) and not line == '': text += line + '\r\n' @@ -1829,6 +1841,12 @@ def prepare_abp(lines) -> str: line ) + line = re.sub( + r".*\$.*,app=.*", + r"", + line + ) + if is_supported_abp(line): text += line + '\r\n' @@ -1848,7 +1866,7 @@ if __name__ == "__main__": with open(OUTPUT_ABP, "w") as text_file: text_file.write(abp_filter) - print('The Eyeo and AdGuard list versions have been generated.') + print('The Eyeo list version has been generated.')