This commit is contained in:
Imre Kristoffer Eilertsen
2022-10-13 22:39:28 +02:00
committed by GitHub
parent de2c87946f
commit 5cd1220f7f
3 changed files with 92 additions and 67 deletions
@@ -4507,7 +4507,7 @@ vmj.se#?#.sidebox:-abp-contains(/Externa länkar|Artiklar/)
! /\/\/\/\/\/\/\/\/\/\ Manuella fixor tillagt av Adblock Plus-teamet / Manual fixes added by the Adblock Plus team /\/\/\/\/\/\/\/\/\/\
! (Currently empty.)
[Adblock Plus 3.13]
! Version: 051020222
! Version: 101020221
! Title: Adblock List for Finland
! Description: Finnish adblock list
! Expires: 4 days
@@ -4694,7 +4694,7 @@ apteekkari.fi##.native-comms
apteekkari.fi#?#.container:has-text(MAINOS (TEKSTI JATKUU ALLA))
apu.fi,lily.fi,meillakotona.fi,terve.fi##[class*=ad__component]
arcticinsider.com##a[href*=bannerTrack]
arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,metropoli.net,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,tinderinparhaat.com,valioliiga.com,viikonloppu.com##.pnad-container
arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,metropoli.net,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomifutis.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,tinderinparhaat.com,valioliiga.com,viikonloppu.com##.pnad-container
arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomifutis.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,valioliiga.com,viikonloppu.com##.td-post-content > .social-share ~ *
arvokisat.com,eurheilu.org,herkkusuut.com,laliiga.com,leijonat.com,nainen.com,nhlsuomi.com,sketsi.net,suomif1.com,suomifutis.com,suomikiekko.com,suomikoris.com,suomiurheilu.com,susijengi.com,valioliiga.com,viikonloppu.com#?#body.post-template-default * .td-main-content-wrap:-abp-has(.tdt-ad-wrap)
arvopaperi.fi##.ads-parade-wrapper
@@ -5093,6 +5093,7 @@ kotikokki.net###partners-container-big
kotikokki.net##[id=content][class="content hrecipe"] ~ [style="float: left; width: 100%; height: 200px; padding-left:20px; padding-right:20px; box-sizing:border-box; background-color:#fff;"]
kotilappi.fi,kuhmolainen.fi,sotkamolehti.fi,ylakainuu.fi##.banner--top
kotiliesi.fi##.article-continues
kotiliesi.fi##.card--is-sponsored
kotiliesi.fi##.wp-block-otavamedia-google-ad-slot
kotiliesi.fi#?#.wp-block-otavamedia-section-management li:-abp-has([id^=dfp__])
kotimaa.fi#?#div[class=" "] > .rendered_board_widget:-abp-has(.kotimaa-adform-widget)
@@ -410,67 +410,67 @@ y6.no
# ——— Anti-phishing filters for tools that support wildcards, are below this line. ———
# ——— Don't be worried if you see entries that resemble major Nordic websites; those are wildcard entries for use with e.g. Samsung Knox, that attempts to stop phishing sites that have stolen the website brands in question. ———
(.*\.)?vg\.no\..*$
(.*\.)?elkjop\.no\..*$
(.*\.)?coop\.no\..*$
(.*\.)?shell\.no\..*$
(.*\.)?finn\.no\..*$
(.*\.)?dnb\.no\..*$
(.*\.)?sparebank1\.no\..*$
(.*\.)?nordea\.no\..*$
(.*\.)?sbanken\.no\..*$
(.*\.)?danskebank\.no\..*$
(.*\.)?komplett\.no\..*$
(.*\.)?nordnet\.no\..*$
(.*\.)?skatteetaten\.no\..*$
(.*\.)?norwegian\.com\..*$
(.*\.)?flysas-no\..*$
(.*\.)?tusenfryd-com\..*$
(.*\.)?*\.gratis-reisebilletter\..*$
(.*\.)?paypal\..*\.no$
(.*\.)?kiwi\.com-*$
(.*\.)?kongeparken\.com-*$
(.*\.)?vipps-sikkerhet\..*$
(.*\.)?getmail-no\..*$
(.*\.)?legoland\\.com-*$\..*$
(.*\.)?faarup\\.com-*$\..*$
(.*\.)?djurs\\.com-*$\..*$
(.*\.)?appleid\..*\.no$
(.*\.)?itunesconnect-.*\.no$
(.*\.)?fintechnow.*\.buzz$
(.*\.)?wealthnews.*\.xyz$
(.*\.)?euronews.*\.buzz$
(.*\.)?softwaredaily.*\.monster$
(.*\.)?stalknews.*\.buzz$
(.*\.)?goldupdates.*\.xyz$
(.*|\.)?vg\.no\..*$
(.*|\.)?elkjop\.no\..*$
(.*|\.)?coop\.no\..*$
(.*|\.)?shell\.no\..*$
(.*|\.)?finn\.no\..*$
(.*|\.)?dnb\.no\..*$
(.*|\.)?sparebank1\.no\..*$
(.*|\.)?nordea\.no\..*$
(.*|\.)?sbanken\.no\..*$
(.*|\.)?danskebank\.no\..*$
(.*|\.)?komplett\.no\..*$
(.*|\.)?nordnet\.no\..*$
(.*|\.)?skatteetaten\.no\..*$
(.*|\.)?norwegian\.com\..*$
(.*|\.)?flysas-no\..*$
(.*|\.)?tusenfryd-com\..*$
(.*|\.)?*\.gratis-reisebilletter\..*$
(.*|\.)?paypal\..*\.no$
(.*|\.)?kiwi\.com-*$
(.*|\.)?kongeparken\.com-*$
(.*|\.)?vipps-sikkerhet\..*$
(.*|\.)?getmail-no\..*$
(.*|\.)?(.*|\.)?legoland\.com-.*\..*$
(.*|\.)?(.*|\.)?faarup\.com-.*\..*$
(.*|\.)?(.*|\.)?djurs\.com-.*\..*$
(.*|\.)?appleid\..*\.no$
(.*|\.)?itunesconnect-.*\.no$
(.*|\.)?fintechnow.*\.buzz$
(.*|\.)?wealthnews.*\.xyz$
(.*|\.)?euronews.*\.buzz$
(.*|\.)?softwaredaily.*\.monster$
(.*|\.)?stalknews.*\.buzz$
(.*|\.)?goldupdates.*\.xyz$
.*\.vidcopa\.me$
(.*\.)?sikre-vipps-konto\..*$
(.*\.)?dnb\.no-*$
(.*\.)?norge\..*\.icu$
signup-*vpns.com
(.*\.)?telenors\..*\.cx$
*-sparebank1.*.net
(.*|\.)?sikre-vipps-konto\..*$
(.*|\.)?dnb\.no-*$
(.*|\.)?norge\..*\.icu$
(.*|\.)?signup-.*vpns\.com
(.*|\.)?telenors\..*\.cx$
(.*|\.)?-sparebank1\..*\.net
^[a-z]{10,12}\.easy\.co$
(.*\.)?bankid-sperret\..*$
(.*|\.)?bankid-sperret\..*$
# ——— Anti-ad filters for tools that support wildcards, are below this line. ———
(.*\.)?annonse\..*\.no$
(.*\.)?ad\..*\.no$
(.*\.)?ad1\..*\.no$
(.*\.)?ad1\..*\.dk$
(.*\.)?ads\..*\.no$
(.*\.)?ads\..*\.dk$
(.*\.)?ads\..*\.is$
(.*\.)?adserver\..*\.dk$
(.*\.)?annonser\..*\.no$
(.*\.)?banner\..*\.no$
(.*\.)?helios\..*\.no$
(.*\.)?advert\..*\.no$
(.*\.)?advertisement\..*\.no$
(.*\.)?auglysingar\..*\.is$
(.*\.)?vefbordar\..*\.is$
(.*\.)?vevlysingar\.*\..*$
(.*\.)?mobilannonce\..*\.dk$
(.*|\.)?annonse\..*\.no$
(.*|\.)?ad\..*\.no$
(.*|\.)?ad1\..*\.no$
(.*|\.)?ad1\..*\.dk$
(.*|\.)?ads\..*\.no$
(.*|\.)?ads\..*\.dk$
(.*|\.)?ads\..*\.is$
(.*|\.)?adserver\..*\.dk$
(.*|\.)?annonser\..*\.no$
(.*|\.)?banner\..*\.no$
(.*|\.)?helios\..*\.no$
(.*|\.)?advert\..*\.no$
(.*|\.)?advertisement\..*\.no$
(.*|\.)?auglysingar\..*\.is$
(.*|\.)?vefbordar\..*\.is$
(.*|\.)?vevlysingar\.*\..*$
(.*|\.)?mobilannonce\..*\.dk$
# ——— Centralised whitelist section ———
# ——— By default, the entries below will only work without modification in 'personalDNSBlocker'. For a whitelist suitable for e.g. Pi-hole, Blokada and DNS66, check out https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList%20alternate%20versions/NordicFiltersDomainsAllowlist.txt ———
@@ -3318,49 +3318,49 @@ def prepare_pihole(lines) -> str:
line = re.sub(
r"^([a-z0-9].*)\.(.*)\.\*",
r"(.*\.)?\1\\.\2\\..*$",
r"(.*|\.)?\1\\.\2\\..*$",
line
)
line = re.sub(
r"^([a-z0-9].*)\.\*$",
r"(.*\.)?\1\\..*$",
r"(.*|\.)?\1\\..*$",
line
)
line = re.sub(
r"^(.*)\.(.*)-\*",
r"(.*\.)?\1\\.\2-*$",
r"(.*|\.)?\1\\.\2-*$",
line
)
line = re.sub(
r"^([a-z0-9].*)\.\*\.(.*)",
r"(.*\.)?\1\\..*\\.\2$",
r"(.*|\.)?\1\\..*\\.\2$",
line
)
line = re.sub(
r"^\*\.(.*)\.\*",
r"(.*\.)?*\\.\1\\..*$",
r"(.*|\.)?*\\.\1\\..*$",
line
)
line = re.sub(
r"^([a-z0-9].*)\*\.(.*)",
r"(.*\.)?\1.*\\.\2$",
r"(.*|\.)?\1.*\\.\2$",
line
)
line = re.sub(
r"(\(\.\*\\\.\)\?){2}",
r"(.*\.)?",
r"(.*|\.)?",
line
)
line = re.sub(
r"^\*\.(.*)\.(.*)$",
r".*\\.\1\\.\2$",
r".*\.\1\.\2$",
line
)
@@ -3370,6 +3370,30 @@ def prepare_pihole(lines) -> str:
line
)
line = re.sub(
r"^([a-z0-9-]{1,})\*([a-z0-9-]{1,})\.([a-z]{2,17})$",
r"(.*|\\.)?\1.*\2\\.\3",
line
)
line = re.sub(
r"^\*(-[a-z0-9]{1,})\.\*\.([a-z]{2,17})$",
r"(.*|\\.)?\1\\..*\\.\2",
line
)
line = re.sub(
r"([a-z0-9])\\\\\.",
r"\1\.",
line
)
line = re.sub(
r"\*\$\\",
r".*\\",
line
)
text += line + '\r\n'
return text