diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index dfd20812d..7331365b7 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -138,6 +138,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"([$,])~stylesheet", + "", + line + ) + line = re.sub( r",important", "$important", @@ -145,7 +151,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\^[*$,][ac-z].*", + r".*\^[*$,][ac-hj-z?].*", "", line ) @@ -240,6 +246,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"\^badfilter", + r"^$badfilter", + line + ) + line = re.sub( r".*\^\*.*", r"", @@ -247,7 +259,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r".*\*\^[a-z0-9].*", + r".*\*\^[a-z0-9?].*", + r"", + line + ) + + line = re.sub( + r".*\^&.*", r"", line ) diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index 4ae46f393..149a343cb 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -10,10 +10,10 @@ @@||9anime.*^ ! —————————————————————————————————————————————— [Adblock Plus 2.0] -! Checksum: poUKZ9l6R/xEc4cfesr4rw -! Version: 201912091051 +! Checksum: T6lNHrNV3WmL0tRxhvF4CA +! Version: 201912091101 ! Title: EasyList without element hiding rules -! Last modified: 09 Dec 2019 10:51 UTC +! Last modified: 09 Dec 2019 11:01 UTC ! Expires: 4 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html @@ -2932,7 +2932,7 @@ ||insightexpressai.com^ ||insitepromotion.com^ ||inskinad.com^ -||inskinmedia.com^$~stylesheet +||inskinmedia.com^ ||inspikon.com^ ||inspiringsweater.xyz^ ||insta-cash.net^ @@ -23805,7 +23805,7 @@ ||tag.regieci.com^ ||tags.sprizzy.com^ ||tags2.adshell.net^ -||takeover.bauermedia.co.uk^$~stylesheet +||takeover.bauermedia.co.uk^ ||tap.more-results.net^ ||thebigchair.com.au^ ||thirdpartycdn.lumovies.com^ @@ -23974,7 +23974,7 @@ ||adsrv.bangbros.com^ ||adtools.gossipkings.com^ ||adtools2.amakings.com^ -||adtrue24.com^$~stylesheet +||adtrue24.com^ ||adult.xyz^ ||aff-jp.dxlive.com^ ||aff-jp.exshot.com^ @@ -24801,6 +24801,7 @@ ! https://github.com/uBlockOrigin/uAssets/issues/699 ! https://forums.lanik.us/viewtopic.php?f=62&t=31389 ! https://github.com/NanoMeow/QuickReports/issues/144 +||fotzenparty.eu^$important ! https://github.com/uBlockOrigin/uAssets/issues/39#issuecomment-269403620 ! https://github.com/uBlockOrigin/uAssets/issues/2913 ! https://github.com/uBlockOrigin/uAssets/issues/356 @@ -25100,7 +25101,7 @@ ! https://github.com/uBlockOrigin/uAssets/issues/282 ! https://github.com/uBlockOrigin/uAssets/issues/418 ! https://github.com/gorhill/uBlock/issues/3176 -||rule34hentai.net^badfilter +||rule34hentai.net^$badfilter ||rule34hentai.net^ ! https://github.com/uBlockOrigin/uAssets/issues/394#issuecomment-304461367 ! https://github.com/uBlockOrigin/uAssets/issues/428 @@ -25132,7 +25133,7 @@ ! https://github.com/uBlockOrigin/uAssets/issues/489 ! https://github.com/uBlockOrigin/uAssets/issues/492 ! https://adblockplus.org/forum/viewtopic.php?f=10&t=53374 -||xstory-fr.com^badfilter +||xstory-fr.com^$badfilter ! https://github.com/gorhill/uBlock/issues/2759 ! https://github.com/uBlockOrigin/uAssets/issues/652 ! https://github.com/uBlockOrigin/uAssets/issues/497 @@ -25154,6 +25155,7 @@ ! https://twitter.com/Lennox__Cassidy/status/885459529072353280 ! anti adb realstream . pw (sport365 . live) ||tags2.adshell.net^$badfilter +||tags2.adshell.net^$important ! https://github.com/uBlockOrigin/uAssets/issues/256#issuecomment-318899683 ! To override an exception filter in EasyList for the site, no clue what ! is the purpose of the exception filter. @@ -25295,17 +25297,20 @@ ! https://github.com/uBlockOrigin/uAssets/issues/703 ! https://github.com/uBlockOrigin/uAssets/issues/795 ! https://github.com/uBlockOrigin/uAssets/issues/3370 -||cdnfiles.site^badfilter +||cdnfiles.site^$badfilter ||choogeet.net^ +||d1n3tk65esqc4k.cloudfront.net^$important ||dgafgadsgkjg.top^ ||gretaith.com^ ||gloalrie.com^ ||inpagepush.com^ ||kipoutch.net^ ||mw19c3mi5a.com^ +||noakauhe.com^$important ||oagwl3372h.com^ ||padsblue.com^ ||poazoanu.com^ +||ryllae.com^$important ||stazumik.net^ ||yacurlik.com^ ! https://forums.lanik.us/viewtopic.php?f=62&t=39344 @@ -26309,7 +26314,7 @@ ! https://github.com/uBlockOrigin/uAssets/issues/1932#issuecomment-465748184 ||acortar.net^ ||acortar.net^ -||acortar.net^badfilter +||acortar.net^$badfilter ||acortalo.*^ ||megadescargas.net^ ! https://github.com/uBlockOrigin/uAssets/issues/1932#issuecomment-457093955 @@ -26419,13 +26424,16 @@ ! https://github.com/uBlockOrigin/uAssets/issues/2103 ! https://forums.lanik.us/viewtopic.php?p=144359#p144359 ! https://github.com/uBlockOrigin/uAssets/issues/4546 +||79zgycmr.com^$important +||f5v1x3kgv5.com^$important +||lvgvax82bp.com^$important ||magdove.xyz^ ||olswr.27684.club^ ||presbanise.pw^ ||stompebi.link^ ||valshara.com^ ||zinrora.pw^ -||cdn000.club^badfilter +||cdn000.club^$badfilter ! https://github.com/uBlockOrigin/uAssets/issues/2104 ! https://github.com/jspenguin2017/uBlockProtector/issues/915 ! https://forums.lanik.us/viewtopic.php?f=62&t=40607 @@ -26536,7 +26544,7 @@ ! https://github.com/uBlockOrigin/uAssets/issues/2258 ! https://github.com/uBlockOrigin/uAssets/issues/2260 ! https://github.com/uBlockOrigin/uAssets/issues/2260#issuecomment-488532216 -||desbloqueador.org^badfilter +||desbloqueador.org^$badfilter ! https://forums.lanik.us/viewtopic.php?f=62&t=16610 ! https://github.com/uBlockOrigin/uAssets/issues/2263 ! https://forums.lanik.us/viewtopic.php?p=136580#p136580 @@ -28230,7 +28238,7 @@ @@||legia.net^ ! https://github.com/uBlockOrigin/uAssets/issues/4396 ||solarporn.net^ -||streamplay.to^badfilter +||streamplay.to^$badfilter ||ig0nr8hhhb.com^ ||stoomeddert.info^ ! https://github.com/uBlockOrigin/uAssets/issues/4397 @@ -28431,6 +28439,7 @@ ||kimsacka.net^ ||naustoch.net^ ||ogeemolt.net^ +||poazoanu.com^$important ||xjuljbjlbb.com^ ! https://github.com/uBlockOrigin/uAssets/issues/4617 ||strpjmp.com^ @@ -31164,8 +31173,9 @@ ||pelcro.com^ ||7636ca6cb9fc.com^ ||5g9quwq.com^ -@@||seekingalpha.com^badfilter +@@||seekingalpha.com^$badfilter @@||womenshealthmag.com^ +||ad.kisscartoon.*^$important ||eurifsiooyof.bid^ ||mms.cnn.com^ ||adpass.co.uk^ @@ -31536,8 +31546,8 @@ ||beqbox.com^ ||weefy.me^ [Adblock Plus 2.0] -! Checksum: rXBEPLhFgr9GtFoYifsTvg -! Version: 201912091043 +! Checksum: Ke6QLNatkUXlWTBkX8q12w +! Version: 201912091053 ! Title: Liste FR ! Expires: 1 days ! Description: Filtres francophones complémentaires à EasyList @@ -37073,8 +37083,6 @@ ||links-protection.com^ ||live.lavoixdux.com^ ||live.prismamediadigital.com^ -||livejasmin.com^$?psid= -||livejasmin.com^&utm_ ||login.meexy.com^ ||lotebo.com^ ||lownet.fr^ @@ -37187,7 +37195,6 @@ ||sikr.chimeratool.com^ ||site.elkhabar.com^ ||sle.pagesjaunes.fr^ -||starzplay.com^&utm_ ||static.*.netdna-cdn.com^ ||static.mntzm.com^ ||static.radio.de^ @@ -38121,10 +38128,10 @@ ! ! FILTERLIST ONLY ! -! Checksum: IAHZcFz6cOw97K/cLiZk9g -! Version: 201912091051 +! Checksum: f9TBmR4mG21Q7nxsN+QhTw +! Version: 201912091101 ! Title: EasyList Germany -! Last modified: 09 Dec 2019 10:51 UTC +! Last modified: 09 Dec 2019 11:01 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.github.io/ ! Licence: https://easylist.github.io/pages/licence.html @@ -38805,10 +38812,10 @@ ! Necessary for AdBlock for Safari to fix blocked slider on shop.rewe.de ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_dimensions.txt *** ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_popup.txt *** -! Checksum: mR1o5Tzwi56ITfcQUwQx4Q -! Version: 201912091050 +! Checksum: cfEGvX+Ll58c9BRveLB37Q +! Version: 201912091100 ! Title: ABP filters -! Last modified: 09 Dec 2019 10:50 UTC +! Last modified: 09 Dec 2019 11:00 UTC ! Expires: 1 hours (update frequency) ! Homepage: https://github.com/abp-filters/abp-filters-anti-cv !