diff --git a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl index 33213a629..a3c3d1d78 100644 --- a/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl +++ b/NorwegianExperimentalList alternate versions/DandelionSproutsNorskeFiltre.tpl @@ -1,5 +1,5 @@ msFilterList -# Version: 13March2020v1-Alpha +# Version: 22March2020v1-Alpha # Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider # Translated title: Dandelion Sprout's Nordic filters for tidier websites : expires = 1 @@ -150,6 +150,7 @@ msFilterList # bt.no -d finn.no distribution-carousel? # https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +# https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 # Copied over from the New AdAway list -d admob.no -d admob.dk @@ -203,6 +204,7 @@ msFilterList -d 85.17.76.181 # https://krs247.no/ # lsk.no +# https://www.budstikka.no/ # ๐Ÿ‡ณ๐Ÿ‡ด: โ€”โ€”โ€” Tomme skillebokser โ€”โ€”โ€” # ๐Ÿ‡ฉ๐Ÿ‡ฐ: โ€”โ€”โ€” Tomme adskillerbokser โ€”โ€”โ€” # ๐Ÿ‡ฎ๐Ÿ‡ธ: โ€”โ€”โ€” Tรณma skilirammar โ€”โ€”โ€” @@ -226,6 +228,8 @@ msFilterList # ๐Ÿ‡ณ๐Ÿ‡ด: Fรฅr Dplay sin pรฅloggingsside til รฅ vises riktig # ๐Ÿ‡ฌ๐Ÿ‡ง: Makes Dplay's login page show up properly +d mparticle.com +# https://github.com/easylist/easylist/issues/5110 ++d widgets.spklw.com # โ€”โ€”โ€” Caused by ยซFanboy's Social Blocking Listยป, if I recall correctly โ€”โ€”โ€” +d api.instagram.com # https://github.com/ryanbr/fanboy-adblock/issues/1261 diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt index 543b1a650..aaf112222 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersABP.txt @@ -1,5 +1,5 @@ [Adblock Plus 3.4] -! Version: 130320201 +! Version: 220320201 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdBlock og Adblock Plus) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdBlock and Adblock Plus) ! Expires: 12 hours @@ -19,7 +19,6 @@ ! โ„: โ€”โ€”โ€” Reklรกmaid โ€”โ€”โ€” ! ๐Ÿ‡ฌ๐Ÿ‡ง: โ€”โ€”โ€” Advertisements โ€”โ€”โ€” ##.annonselenker -##.content-adunit ##.full-width.daily-offers ##.inline-ad-text ##.native-advertisement @@ -318,6 +317,9 @@ tv2.no##.spklw-post-attr[data-pc] ||finn.no/distribution-carousel?$object,third-party ! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen ##.spklw-post-attr[data-recommendation-type=sprinkleit] +! https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 +##.native-ad-kicker +##.content-adunit ! Copied over from the New AdAway list ||admob.no^$third-party ||admob.dk^$third-party @@ -746,6 +748,8 @@ vafo.dk##.adform-flexblock ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item +! https://www.budstikka.no/ +##div[data-placeholder=lokalnative] ! ๐Ÿ‡ณ๐Ÿ‡ด: โ€”โ€”โ€” Tomme skillebokser โ€”โ€”โ€” ! ๐Ÿ‡ฉ๐Ÿ‡ฐ: โ€”โ€”โ€” Tomme adskillerbokser โ€”โ€”โ€” @@ -787,6 +791,8 @@ dyrevennene.no##.td-footer-wrapper ! ๐Ÿ‡ฌ๐Ÿ‡ง: Makes Dplay's login page show up properly @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@||assets.adobedtm.com/*/satelliteLib-$domain=auth.dplay.no|auth.dplay.dk +! https://github.com/easylist/easylist/issues/5110 +@@||widgets.spklw.com^$domain=abcnyheter.no ! โ€”โ€”โ€” Caused by ยซFanboy's Social Blocking Listยป, if I recall correctly โ€”โ€”โ€” krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 0622679cb..0b5d1e868 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -1,4 +1,4 @@ -! Version: 13March2020v1 +! Version: 22March2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for AdGuard) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (for AdGuard) ! Expires: 12 hours @@ -18,7 +18,6 @@ ! โ„: โ€”โ€”โ€” Reklรกmaid โ€”โ€”โ€” ! ๐Ÿ‡ฌ๐Ÿ‡ง: โ€”โ€”โ€” Advertisements โ€”โ€”โ€” ##.annonselenker -##.content-adunit ##.full-width.daily-offers ##.inline-ad-text ##.native-advertisement @@ -322,6 +321,9 @@ tv2.no##.spklw-post-attr[data-pc] ||finn.no/distribution-carousel?$object,third-party ! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen ##.spklw-post-attr[data-recommendation-type=sprinkleit] +! https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 +##.native-ad-kicker +##.content-adunit ! Copied over from the New AdAway list ||admob.no^$third-party ||admob.dk^$third-party @@ -765,6 +767,8 @@ vafo.dk##.adform-flexblock ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item +! https://www.budstikka.no/ +##div[data-placeholder=lokalnative] ! ๐Ÿ‡ณ๐Ÿ‡ด: โ€”โ€”โ€” Tomme skillebokser โ€”โ€”โ€” ! ๐Ÿ‡ฉ๐Ÿ‡ฐ: โ€”โ€”โ€” Tomme adskillerbokser โ€”โ€”โ€” @@ -806,6 +810,8 @@ dyrevennene.no##.td-footer-wrapper ! ๐Ÿ‡ฌ๐Ÿ‡ง: Makes Dplay's login page show up properly @@||mparticle.com$script,domain=auth.dplay.no|auth.dplay.dk @@||assets.adobedtm.com/*/satelliteLib-$domain=auth.dplay.no|auth.dplay.dk +! https://github.com/easylist/easylist/issues/5110 +@@||widgets.spklw.com^$domain=abcnyheter.no ! โ€”โ€”โ€” Caused by ยซFanboy's Social Blocking Listยป, if I recall correctly โ€”โ€”โ€” krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt index 8edd2a379..1a6e72f41 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivacy.txt @@ -1,4 +1,4 @@ -! Version: 13March2020v1 +! Version: 22March2020v1 ! Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting) ! Translated title: Dandelion Sprout's Nordic filters for tidier websites (without tracker whitelistings) ! Expires: 12 hours @@ -18,7 +18,6 @@ ! โ„: โ€”โ€”โ€” Reklรกmaid โ€”โ€”โ€” ! ๐Ÿ‡ฌ๐Ÿ‡ง: โ€”โ€”โ€” Advertisements โ€”โ€”โ€” ##.annonselenker -##.content-adunit ##.full-width.daily-offers ##.inline-ad-text ##.native-advertisement @@ -322,6 +321,9 @@ tv2.no##.spklw-post-attr[data-pc] ||finn.no/distribution-carousel?$object,3p ! https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen ##.spklw-post-attr[data-recommendation-type=sprinkleit] +! https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 +##.native-ad-kicker +##.content-adunit ! Copied over from the New AdAway list ||admob.no^$3p ||admob.dk^$3p @@ -765,6 +767,8 @@ vafo.dk##.adform-flexblock ##div[id^=webbannernetboard] ! lsk.no ##.ads__grid-item +! https://www.budstikka.no/ +##div[data-placeholder=lokalnative] ! ๐Ÿ‡ณ๐Ÿ‡ด: โ€”โ€”โ€” Tomme skillebokser โ€”โ€”โ€” ! ๐Ÿ‡ฉ๐Ÿ‡ฐ: โ€”โ€”โ€” Tomme adskillerbokser โ€”โ€”โ€” @@ -806,6 +810,8 @@ dyrevennene.no##.td-footer-wrapper ! ๐Ÿ‡ฌ๐Ÿ‡ง: Makes Dplay's login page show up properly +! https://github.com/easylist/easylist/issues/5110 + ! โ€”โ€”โ€” Caused by ยซFanboy's Social Blocking Listยป, if I recall correctly โ€”โ€”โ€” krom.is#@#.share-container @@/images/*youtube.jpg$domain=realityportalen.dk diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action index 1f7ded9e1..8c9aaa698 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action +++ b/NorwegianExperimentalList alternate versions/NordicFiltersPrivoxy.action @@ -1,4 +1,4 @@ -# Version: 13March2020v1-Alpha +# Version: 22March2020v1-Alpha # Title: ๐Ÿ”๏ธ Dandelion Sprouts nordiske filtre for ryddigere nettsider (for Privoxy) # Translated title: Dandelion Sprout's Nordic filters for tidier websites (for Privoxy) # Expires: 12 hours @@ -177,6 +177,7 @@ contentMarketing # bt.no .finn.no/distribution-carousel? # https://kulturplot.no/synspunkt/2020/hva-er-malet-for-kultur-i-regionreformen +# https://www.dagbladet.no/mat/spaghetti--la-capri-italienerne-liker-sausen-men-n-ting-far-slakt---dette-er-ikke-pasta/67659821 # Copied over from the New AdAway list .admob.no .admob.dk @@ -234,6 +235,7 @@ contentMarketing .85.17.76.181 # https://krs247.no/ # lsk.no +# https://www.budstikka.no/ # # ๐Ÿ‡ณ๐Ÿ‡ด: โ€”โ€”โ€” Tomme skillebokser โ€”โ€”โ€” # ๐Ÿ‡ฉ๐Ÿ‡ฐ: โ€”โ€”โ€” Tomme adskillerbokser โ€”โ€”โ€” @@ -260,6 +262,7 @@ contentMarketing # Attempts to resolve how some frontpage articles are hard to open # ๐Ÿ‡ณ๐Ÿ‡ด: Fรฅr Dplay sin pรฅloggingsside til รฅ vises riktig {+block{Makes Dplay's login page show up properly}} +# https://github.com/easylist/easylist/issues/5110 # โ€”โ€”โ€” Caused by ยซFanboy's Social Blocking Listยป, if I recall correctly โ€”โ€”โ€” # https://github.com/ryanbr/fanboy-adblock/issues/1261 # โ€”โ€”โ€” Caused by ยซFanboy's Annoyances Listยป โ€”โ€”โ€” diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 20d96e985..5e9ace23a 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1147,6 +1147,12 @@ def prepare_privacy(lines) -> str: line ) + line = re.sub( + r"^@.*widgets\.spklw\..*", + "", + line + ) + line = re.sub( "Dandelion Sprouts nordiske filtre for ryddigere nettsider", "Dandelion Sprouts nordiske filtre for ryddigere nettsider (uten sporerhvitelisting)",