Had forgot to re-instate the +js entries in the Brave version

Of interest to https://github.com/brave/adblock-rust/pull/90.
This commit is contained in:
Imre Kristoffer Eilertsen
2020-07-02 13:04:19 +02:00
committed by GitHub
parent b63de7fd32
commit 93c8a6dd3d
2 changed files with 52 additions and 1 deletions
@@ -16,7 +16,20 @@
! 🇬🇱: ——— Pilerisaarniarlugit ———
! ❄: ——— Reklámaid ———
! 🇬🇧: ——— Advertisements ———
amino.dk###Abox.AminoBox
blogg.no##+js(set, showAd, false)
borsen.dk##[href*="://borsen.dk/sponsoreret"]
contentMarketing$xhr,domain=sol.no
dplay.*##[class^=notificationArea]
gamer.no,tu.no##+js(acis, dfpConfig, loadAds)
nakenprat.com##+js(aopr, document.dispatchEvent)
side2.no##[href*="clk.tradedoubler.com/click"]
side2.no##[href*="track.adtraction.com/t/t"]
tv2.no##+js(json-prune, enabled, testhide)
tvkampen.com,tvsporten.dk##+js(aopw, onload)
vg.no##+js(acis, Math.floor, g00)
vg.no,e24.no,gamer.no,tek.no,digi.no##+js(aopw, __AB__)
vgtv.no##+js(golem.de.js)
|blob:https://www.veier24.no/$image
||1819.is/infosmall/$image
||3.248.18.175^
@@ -201,6 +214,13 @@ contentMarketing$xhr,domain=sol.no
@@||f.nordiskemedier.dk/2*_*.png^$image
! building-supply.dk
||f.nordiskemedier.dk/banner^
dagbladet.no,sol.no##[class^=AdPrefix-]
dn.no##[id^=googlead-]:not(#googlead-toppbanner)
godt.no##[class^=advert]
jyllands-posten.dk###MegaBoard_Top
qxl.*###GoogleAdsenseFooter + div[style^="width: 100%;"]
trening.no##[id^=dt-netboard]
utdanningsnytt.no###Topbanner
-l%C3%BDsing-$image,domain=news.fo
! — — — — —
! 🇳🇴: Generelle oppføringer med kilder
@@ -209,6 +229,9 @@ contentMarketing$xhr,domain=sol.no
!#endif
! sol.no
! www.qxl.no
###BannerEniro
###GoogleAdsenseWideSkyscraper
###GoogleAdsenseWideSkyscraperLeft
! www.vtb.no
! vafo.dk
! reelligestilling.dk
@@ -224,15 +247,20 @@ contentMarketing$xhr,domain=sol.no
! www.mbl.is/frettir/
! adressa.no
! kk.no, sol.no
##[type=advertisement]
##[class^=AdWrapper]
! historienet.no, natgeo.no, komputer.no
! https://www.nettavisen.no/okonomi/3423875562.html
! qxl.no
###GoogleAdsensePanorama
###GoogleAdsenseFooter
! nickelodeon.no, tv2.dk, klikk.no, zooom.no, adressa.no, blogg.no, kjarkinn.is
! gamer.no, veier24.no, at.no, porten.no, insidetelecom.no, elektronikkbransjen.no, tu.no, digi.no
! steigan.no, allers.no, icelandreview.com, resett.no
! demokraten.no, avisa-hordaland.no, blv.no, gat.no, lp.no, osogfusa.no, raumnes.no, setesdolen.no, sunnhordland.no, vaksdalposten.no, vtb.no
! ba.no
! https://github.com/DandelionSprout/adfilt/pull/53
##[id^=art-bazaarAd]
! aftenbladet.no
! avisalofoten.no
! blv.no/nyheter/kan-bruke-23-millioner-pa-the-whale-undersokelsene
@@ -331,6 +359,9 @@ $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|wi
/prerolls/*$domain=gamereactor.no|gamereactor.dk
/viewability.$important,script,domain=gamereactor.no|gamereactor.dk
@@||openx.gamereactor.dk/www/delivery/fc.php$xhr,domain=gamereactor.no|gamereactor.dk
gamereactor.*##+js(acis, phpads_deliver)
gamereactor.*##+js(aopw, banner_video)
gamereactor.*##+js(nano-stb)
||gamereactor.*/lay/ad-video-stats.$important,script
||gamereactor.*/lay/js/adblock_desktop.$important,script
||gamereactor.*/lay/js/background.$important,script
@@ -347,7 +378,11 @@ $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|wi
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
! 🇳🇴: 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.
resett.no##[class="td_single_image_bg"]
/*-annonse-*$image,domain=resett.no
elkjop.no,elgiganten.dk###A-value:style(fill: #fff12c !important)
elkjop.no,elgiganten.dk###B-value:style(fill: #edb731 !important)
elkjop.no,elgiganten.dk###C-value:style(fill: #ed8631 !important)
! 🇬🇧: Category: Compatibility entries for ABP users, EasyList, and/or functionality whitelisting
! https://github.com/AdguardTeam/AdguardForWindows/issues/3209
!#if adguard_app_windows
@@ -618,6 +653,13 @@ $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|wi
! 🇮🇸: ——— And-and-auglýsingshindrun ———
! 🇬🇧: ——— Anti-anti-adblocking ———
! Last updated: 10June2020v1-Extension
gratiskostplaner.dk##+js(aopw, KillAdBlock)
dagensbyggeri.dk##+js(std, (), 2500)
eurosport.*##+js(aeld, contextmenu)
gratisspil.dk##+js(aopw, AdBlockerInfo)
techstart.dk##+js(set, adblock, false)
tv2.no##+js(acis, adblockDetector)
vg.no##+js(aeld, load, concat)
||aftenposten.no/seksjon/dist/ads-$script
||dni-adops-proxy-prod-adopsmediaconverter.mercury.dnitv.com/$media,redirect=noopmp3-0.1s,domain=dplay.no|dplay.dk
||elderlyscissors.com^
@@ -630,9 +672,12 @@ $csp=upgrade-insecure-requests,domain=skessuhorn.is|sporttv.is|bobilverden.no|wi
@@||fwmrm.net/ad/$script,domain=dplay.no|dplay.dk
@@||sixscissors.com^$3p,domain=itavisen.no
@@||www.tv2.no/s/js/ads.js$script,1p
gamereactor.*##+js(set, adblockEnabled, noopFunc)
gamereactor.*##+js(set, trackAdblock, noopFunc)
!#if !ext_ublock
@@||bildeler.name$generichide
@@||reservedele.name$generichide
!#endif
!#if env_firefox
gamereactor.*##^script[onError="adblockEnabled()"]
!#endif
@@ -7,7 +7,7 @@ UNSUPPORTED_ABP = ['$important', ',important', '$redirect=', ',redirect=',
':style', '##+js', '.*#' , 'dk,no##', '!#if', '!#endif', '!+ ', '##^']
UNSUPPORTED_TPL = ['##', '#@#', '#?#', r'\.no\.$']
UNSUPPORTED_PRIVOXY = ['##', '#@#', '#?#', '@@', '!#']
UNSUPPORTED_BRAVE = ['##', '#@#', '#?#', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn', '!+ NOT_OPTIMIZED']
UNSUPPORTED_BRAVE = ['#@#', '#?#', 'emty.gif', '1pix.gif', '730.no/banner/', 'gaysir.no/rek/', '85.17.76.181', 'youtube.jpg', 'instagram', 'cookieinformation', 'Social Blocking', '/admark_', 'PFBLOCKERNG', 'boks', 'rammar', ' spaces', 'services.api.no', 'Viatrumf', 'Internet Explorer', 'Elkjøp', ' elding.fo', ' background', 'baggrund', 'EasyList —', 'baksýn', '!+ NOT_OPTIMIZED']
OUTPUT = 'xyzzyx.txt'
OUTPUT_ABP = 'NordicFiltersABP.txt'
@@ -1119,6 +1119,12 @@ def prepare_brave(lines) -> str:
line
)
line = re.sub(
r".*##[a-z.].*",
r"",
line
)
if is_supported_brave(line) and not line == '':
text += line + '\r\n'