From 9a34d7e97dd1ff376e25539df7cb721433b945f2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 3 Apr 2020 00:18:28 +0200 Subject: [PATCH] Add files via upload --- AdGuard Home Compilation List/AGHtest.py | 12 +++- .../AdGuardHomeCompilationList.txt | 61 ++++++++----------- .../AdGuardHomeCompilationListIPs.txt | 1 - 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 56a99ab2e..ff09a4f88 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -373,7 +373,7 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^/.*[a-z0-9_=.,*?|^@&~+;-]$", + r"^/.*[a-zA-Z0-9_=.,*?!|^@&~+;-]$", r"", line ) @@ -397,7 +397,13 @@ def prepare_agh(lines) -> str: ) line = re.sub( - r"^/.*[a-zA-Z0-9]\\?/[a-z0-9\(].*", + r"^/.*[a-z0-9]\\?/[a-z0-9\(].*", + r"", + line + ) + + line = re.sub( + r"\|\|.*_.*", r"", line ) @@ -758,7 +764,7 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^@@", + r"^@@.*", r"", line ) diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index 6dbbd958e..632ad6039 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -11,10 +11,10 @@ @@||104.198.251.169 ! —————————————————————————————————————————————— [Adblock Plus 2.0] -! Checksum: NLQ3roW9G8WnzL5OSbvDWA -! Version: 202004022201 +! Checksum: cqZsbBVDJpCXoTQ3p27p1w +! Version: 202004022211 ! Title: EasyList without element hiding rules -! Last modified: 02 Apr 2020 22:01 UTC +! Last modified: 02 Apr 2020 22:11 UTC ! Expires: 4 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html @@ -32,8 +32,6 @@ ://pop-over. ://promo. ://synad. -||takeover_background. -||takeover_banner_ ! https://github.com/easylist/easylist/issues/5054 ! bc.vc (https://github.com/NanoMeow/QuickReports/issues/198) ! Native advert @@ -17724,7 +17722,6 @@ ||airpushmarketing.s3.amazonaws.com^ ||ak.imgaft.com^ ||ak1.imgaft.com^ -||algart.net*_banner_ ||analytics.disneyinternational.com^ ||ao-freegeoip.herokuapp.com^ ||api.140proof.com^ @@ -18777,7 +18774,6 @@ ! Firefox freezes if not blocked on reuters.com (http://forums.lanik.us/viewtopic.php?f=64&t=16854) ! Anti-Adblock ||http.anno.channel4.com*- -||http.anno.channel4.com*_*_*_ ! webrtc-ads ! websocket-ads ! IP address @@ -20479,7 +20475,6 @@ ! porn555 .com popups ! see .xxx ||worldmapd.online^ -||impactserving.com^ ||doublepimpads.com^ @@||disingkat.in^ ! https://github.com/AdguardTeam/AdguardFilters/issues/49559 @@ -21185,8 +21180,8 @@ ||smsiak.eu^ ||smsy24.pl^ [Adblock Plus 2.0] -! Checksum: UiaMKJxwLqXfqiWdYUM14Q -! Version: 202004022153 +! Checksum: u5ZxOq+ytBV2kLtDfD4aGA +! Version: 202004022203 ! Title: Liste FR ! Expires: 1 days ! Description: Filtres francophones complémentaires à EasyList @@ -21199,14 +21194,9 @@ /afiliasi/*/banners/ /anuncy/*/ads/ /block.*/rotator/ -/f.php?aid=AID /images/*_ads/ /pub-300x300/ -/service-worker.js?*%2B -/service-worker.js?*%2E /static/*/ads/ -/sw.js?%2B -/sw.js?*%2E ://aclick. ://ad-start. ://adlik. @@ -21272,7 +21262,6 @@ ! CDN filters ! TLD !------------------------ Génériques popup -----------------------! -/redirector.*/?#! ://aclick. ://ads2. ://adv-mybankai. @@ -27880,10 +27869,10 @@ ||cookielaw.emea.fcagroup.com ||cmp.osano.com ! FILTERLIST ONLY -! Checksum: ZfHEndrx5NuBz8bGkbOIKw -! Version: 202004022201 +! Checksum: vnAp49doUJFgPZu0K7aPww +! Version: 202004022211 ! Title: EasyList Germany -! Last modified: 02 Apr 2020 22:01 UTC +! Last modified: 02 Apr 2020 22:11 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.github.io/ ! Licence: https://easylist.github.io/pages/licence.html @@ -28559,10 +28548,10 @@ ! "Matched Content" by Google (https://support.google.com/adsense/answer/6111336) ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_dimensions.txt *** ! *** easylistgermany:easylistgermany/easylistgermany_whitelist_popup.txt *** -! Checksum: 1hJC1PIKt77Bm+GWt/p6gw -! Version: 202004022200 +! Checksum: goFGxRM8Y8U9LCPfKRzfoA +! Version: 202004022210 ! Title: ABP filters -! Last modified: 02 Apr 2020 22:00 UTC +! Last modified: 02 Apr 2020 22:10 UTC ! Expires: 1 hours (update frequency) ! Homepage: https://github.com/abp-filters/abp-filters-anti-cv ! Filter list designed to fight circumvention ads in Adblock Plus @@ -28735,10 +28724,10 @@ ||d2zjlj1vewrxcj.cloudfront.net^ ! *** Fetched from: https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/tamil.txt *** ! #9274 -! Checksum: SNxvpqn+PElss9My26tVOA -! Version: 202004022200 +! Checksum: qdMuhgFeuUILOXOswD+9OA +! Version: 202004022210 ! Title: Adblock Warning Removal List -! Last modified: 02 Apr 2020 22:00 UTC +! Last modified: 02 Apr 2020 22:10 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html @@ -28764,10 +28753,10 @@ ||shellcat.ru^ ! *** antiadblockfilters:antiadblockfilters/antiadblock_slovak.txt *** ! *** antiadblockfilters:antiadblockfilters/antiadblock_spanish.txt ***[Adblock Plus 2.0] -! Checksum: fVZVJIel6rpi3A19wOm8Kg -! Version: 202004022200 +! Checksum: jd3gIpj9Dq0kTXWiFj2Qaw +! Version: 202004022210 ! Title: RU AdList -! Last modified: 02 Apr 2020 22:00 UTC +! Last modified: 02 Apr 2020 22:10 UTC ! Expires: 2 days (фильтр обновляется автоматически каждые 2 дня) ! Homepage: https://forums.lanik.us/viewforum.php?f=102 ! Дополнительный региональный фильтр RU AdList к фильтру EasyList @@ -37758,8 +37747,8 @@ ! - hide & block ! - Против "бесконечной загрузки страниц" ------------------------------------- @@||adriver.ru^ -! Checksum: S9VApyvufBHxVI+JbFQ0hw -! Version: 202004022200 +! Checksum: MT03dgXn5Gf7K8SK76dN9A +! Version: 202004022210 ! Title: Liste AR ! Expires: 2 days ! Description: القائمة العربية لمانع الشرائط الإعلانية آدبلوك بلس، مكمِّلة للقائمة الفرنسية و الإنجليزية @@ -37984,10 +37973,10 @@ ! Liste blanche pour corriger le blocage strict !----------------------- Exceptions d'éléments -----------------------! !---------------------------- Anti-Adblock ---------------------------! -! Checksum: CakJZ3hXsD1nPYHxr05VwA -! Version: 202004022201 +! Checksum: 6i03AXu8ty6CZKQCh4T9rQ +! Version: 202004022211 ! Title: EasyList Spanish -! Last modified: 02 Apr 2020 22:01 UTC +! Last modified: 02 Apr 2020 22:11 UTC ! Expires: 1 days (update frequency) ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html @@ -38292,10 +38281,10 @@ ! https://forum.adguard.com/index.php?threads/puls4-com.21577/ ! https://forum.adguard.com/index.php?threads/14675/ [Adblock Plus 2.0] -! Checksum: 2nT0Err1vI0+QUSqqwAlfw -! Version: 202004022201 +! Checksum: viZUKXUSwtzZ6nMv9VYopQ +! Version: 202004022211 ! Title: Fanboy's Notifications Blocking List -! Last modified: 02 Apr 2020 22:01 UTC +! Last modified: 02 Apr 2020 22:11 UTC ! Expires: 1 days (update frequency) ! License: http://creativecommons.org/licenses/by/3.0/ ! Please report any unblocked content or problems by email or in our forums diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt index 3d7a278a3..831a29adb 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt @@ -4,7 +4,6 @@ ! Licence: In accordance with the Dandelicence, the borrowed entries are considered to have been changed and reduced enough from their original lists, that they're counted as transformative work, meaning that creditation and seperate paragraphs are not necessary unless one of the lists' makers were to ask for such. ! Description: This was made as a proof-of-concept to see if the IP-based entries of major adblock lists, could be used to create an IP adblocker list for IP blockers, despite how IP lists are normally only meant to block malware, E-mail spam, or port scanners. ! Version: 02April2020v1-Alpha -104.198.251.169 104.154.237.93 174.142.194.177 194.71.107.25