From e952c8c148f2cb038aabd1990b41faa94c186626 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 9 Nov 2023 18:44:31 +0100 Subject: [PATCH] Add files via upload --- .../NordicFiltersAdGuard.txt | 34 +++++++++---------- .../XYZPrepareFilters.py | 12 +++++++ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt index 6e19a2991..c470566ce 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersAdGuard.txt @@ -543,7 +543,7 @@ dk##section.article__adblock ||ads.*.no^ ||adserver.*.dk^ ||annonser.*.no^$domain=~annonser.gess.no -||auglysingar.*.is^$frame +||auglysingar.*.is^$subdocument ||banner.*.no^ ||helios.*.no^ ||vefbordar.*.is^$third-party @@ -568,7 +568,7 @@ dk##section.article__adblock ||easy-ads.dk^$third-party ||heartbeat.airserve.net^$third-party ||images.passendo.com^$third-party -||isweb.no^$frame +||isweb.no^$subdocument ||kunde.apt.no^$third-party ||kynning.olis.is^$third-party ||matriell.dm-storage.no^$image,third-party @@ -581,7 +581,7 @@ dk##section.article__adblock ||tankeogteknikk.no^$third-party ||tracking-genesisaffiliates.com^$image,third-party ||vefbordi.is^$third-party -||vevlysingar.fo^$frame,third-party +||vevlysingar.fo^$subdocument,third-party ||videotool.fbg.dk^$third-party ||svindel.info^ ||annoncer.nichehuset.dk^$third-party @@ -677,14 +677,14 @@ contentMarketing$xmlhttprequest,domain=sol.no ||arendalstidende.no/wp-content/uploads/*_490px.jpg^ ||austevollforlag.no/wp-content/*/yachtmarine2014.$image ||austurfrett.is/images/*augl.jpg^ -||banner.landbrugsavisen.dk/reklame.aspx$frame +||banner.landbrugsavisen.dk/reklame.aspx$subdocument ||biip.no/wp-content/uploads/*320x250.jpg^$image ||bobilverden.no/wp-content/uploads/*/Banner-1200x300px.jpg^ ||bornholm.nu/nonsec/banner$image -||cdn.rikstoto.no/expert/GameShop^$frame,third-party,domain=~tipster.no +||cdn.rikstoto.no/expert/GameShop^$subdocument,third-party,domain=~tipster.no @@||cdnboligkanalen.azureedge.net/*width=2000^ ||damoh.vgtv.no/hic_qos$script,redirect=noopjs,domain=vg.no -||deals.innocode.no/api^$third-party,frame +||deals.innocode.no/api^$third-party,subdocument ||dust2.dk/img/banners/*$image ||export.prisguide.no^$domain=diskusjon.no ||export.prisguiden.no^$domain=diskusjon.no @@ -693,7 +693,7 @@ contentMarketing$xmlhttprequest,domain=sol.no ||feltet.dk/*/wallpaper_1.jpg^ ||feltet.dk/*_300x60.gif^ ||feltet.dk/octo_cms/files/Feltet.dk//$image -||finn.no^$frame,domain=bt.no +||finn.no^$subdocument,domain=bt.no ||footy.dk/wp-content/uploads/*/Sk%C3%A6rmbillede-*.png^ ||gratisxxx.no^$image,domain=nakenprat.com /wp-content/uploads/*.gif^$domain=hnytt.no|karfan.is @@ -704,14 +704,14 @@ contentMarketing$xmlhttprequest,domain=sol.no ||leikjaland.is/*/bannerstopright/$image ||leikjaland.is/images/*logo.png| ||magasinetreiselyst.no/wp-content/*_annonse*promo$image -||media.sonymusic.no/marketing/*.html$frame,third-party +||media.sonymusic.no/marketing/*.html$subdocument,third-party ||melkoghonning.no/wp-content/uploads/*_980x300px.jpg^ ||melkoghonning.no/wp-content/uploads/*_Banner_$image ||n247.no/salg^ @@||n247.no/salg/an_%7B40 @@||n247.no/salg/an_%7B6C @@||n247.no/salg/karusell_17 -||nordlysid.fo/lysing^$frame +||nordlysid.fo/lysing^$subdocument ||norskenettsider.no/images/ageras-banner.jpg ||norskenettsider.no/images/remember-banner-2016.jpg ||nvnytt.no/images/*annonse-$image @@ -757,7 +757,7 @@ contentMarketing$xmlhttprequest,domain=sol.no ||viasport-assets.mtg-api.com/*/prod/comScore-*.js$script ||vikari.is/skjol/frjalsi-lif*.png^ ||xn--bredbnd-ixa.dk/wp-content/*/velkommen_banner$image,important -||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$frame +||youtube.com/embed/*&origin=https%3A%2F%2Fwww.feltet.dk&widgetid=1$subdocument /Bannere/*$image,domain=tek.no|gamer.no /bazaar/*$script,domain=nettavisen.no /bilder/erotikk1.jpg$domain=eavisa.com @@ -790,7 +790,7 @@ contentMarketing$xmlhttprequest,domain=sol.no ||canariposten.no/wp-content/uploads/300x1500*$image ||stream.fo/wp-content/uploads/*-300x111.jpg^ ||frilansinfo.no/wp-content/themes/frilansinfo-no/img/*-annonse.jpg^ -||thaiguiden.no/tg-980.html$frame +||thaiguiden.no/tg-980.html$subdocument ||thainytt.no/files/160_*$image ||thainytt.no/files/*-160.jpg^ ||nyteknikk.no/images.php/180x^$image @@ -800,7 +800,7 @@ contentMarketing$xmlhttprequest,domain=sol.no ||malviknytt.no/wp-content/uploads/*-firkant-*e1*.$image ||reiseliv.no/wp-content/uploads/*-Annons%C3%B8rinnhold-*-Aksjer-*.$image ||escort46.dk/bg_images^$image -||forum.flyprat.no/images/r/Header^$frame +||forum.flyprat.no/images/r/Header^$subdocument _300x250px-*.gif^$domain=ilaks.no -banner_$domain=hnytt.no,image ||fcbarcelona.dk/images/bcn_*.gif^ @@ -1712,10 +1712,10 @@ baadmagasinet.dk##.article-bottom .qx-inner > .qx-section:last-of-type ! 🇳🇴: Blokkeringsoppføringer ! 🇬🇧: Blocking-entries ||fcbarcelona.dk/*/images/footerbg.jpg^$image -||730.no/banner/*/sonymusic/$frame +||730.no/banner/*/sonymusic/$subdocument ||danishfamilysearch.dk/images/xp2^$image ||gulindex.no/-/js/spring.js^ -||mmm.dk/safeframe^$frame +||mmm.dk/safeframe^$subdocument ||static.vg.no/css/admark_top.gif ||yrkesbil.no/gifs/1pix.gif^ ||www-presse-fotos-dk.filesusr.com^ @@ -2079,7 +2079,7 @@ ekstrabladet.dk#@#body>div[id][style] ! https://old.reddit.com/r/uBlockOrigin/comments/gye2f2/cant_watch_videos_on_a_specific_website_with/ft9zlse/ @@||cmp.ekstrabladet.dk/get_site_data$xmlhttprequest,~third-party @@||dialogue.sp-prod.net/messagingWithoutDetection.js$script,domain=ekstrabladet.dk -@@||notice.sp-prod.net^$frame,domain=ekstrabladet.dk +@@||notice.sp-prod.net^$subdocument,domain=ekstrabladet.dk !#if env_firefox @@||sp-prod.net^$xmlhttprequest,domain=ekstrabladet.dk !#endif @@ -2105,8 +2105,8 @@ spleis.no##+js(set, __INITIAL_STATE__.features.should-show-snow, false) ! 🇩🇰: ——— Norsk Tipping, inkl. nogle tvivlsomt motiverede lottoreklamer (Nogle ikke-påtrængende sportstipsreklamer er akseptabelt i mine øjne) ——— ! 🇳🇴🏞: ——— Norsk Tipping, inkl. tvilsamt motiverte lottoreklamar (Ein håndfull ikkje-påtrengande tippereklamar er i orden for meg) ——— ! 🇬🇧: ——— Norsk Tipping, incl. poorly motivated lotto ads (A few non-pushy football pool ads are fine in my book) ——— -||widget.tippebannere.no^$frame,domain=~tipster.no -||tipster.no/embed$frame +||widget.tippebannere.no^$subdocument,domain=~tipster.no +||tipster.no/embed$subdocument ###ntwidget ##.ntbox-btn ##.ntbox-tab.bg-primary diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index bdf89d64f..6380c38c0 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -214,6 +214,18 @@ def prepare_ag(lines) -> str: line ) + line = re.sub( + r"^\|\|((([0-9]){1,3}\.){3})\$.*", + r"\1.*$network", + line + ) + + line = re.sub( + r"([$,])frame(,|$)", + r"\1subdocument\2", + line + ) + text += line + '\n' return text