diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 280524aa2..b2f6a917e 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -1,10 +1,10 @@ import requests import re -SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AdGuard%20Home%20Compilation%20List/TopDescription.notlist', 'https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2022.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2023.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2024.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/quick-fixes.txt', 'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/BaseFilter/sections/adservers.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/BaseFilter/sections/general_extensions.txt', 'https://filters.adtidy.org/extension/ublock/filters/16.txt', 'https://easylist-downloads.adblockplus.org/easylistgermany.txt', 'https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/english.txt', 'https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/french.txt', 'https://easylist-downloads.adblockplus.org/antiadblockfilters.txt', 'https://easylist-downloads.adblockplus.org/advblock.txt', 'https://easylist-downloads.adblockplus.org/Liste_AR.txt', 'https://easylist-downloads.adblockplus.org/easylistspanish.txt'] +SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AdGuard%20Home%20Compilation%20List/TopDescription.notlist', 'https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2020.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2021.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2022.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2023.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2024.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters-2025.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/badware.txt', 'https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/quick-fixes.txt', 'https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/BaseFilter/sections/adservers.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/BaseFilter/sections/general_extensions.txt', 'https://filters.adtidy.org/extension/ublock/filters/16.txt', 'https://easylist-downloads.adblockplus.org/easylistgermany.txt', 'https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/english.txt', 'https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/french.txt', 'https://easylist-downloads.adblockplus.org/antiadblockfilters.txt', 'https://easylist-downloads.adblockplus.org/advblock.txt', 'https://easylist-downloads.adblockplus.org/Liste_AR.txt', 'https://easylist-downloads.adblockplus.org/easylistspanish.txt'] -UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$ghide', ',ghide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain', '[Adblock Plus 2.0]', 'CV-', '$csp'] -UNSUPPORTED_IP = ['##', '@#', '#?#', '#%#', 'domain=', 'generichide', '$csp', 'badfilter', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '!+'] +UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$ghide', ',ghide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain', '[Adblock Plus 2.0]', 'CV-', '$csp', '$:'] +UNSUPPORTED_IP = ['##', '@#', '#?#', '#%#', 'domain=', 'generichide', '$csp', 'badfilter', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '!+', '$:'] OUTPUT = 'xyzzyx.txt' OUTPUT_AGH = 'AdGuardHomeCompilationList.txt' @@ -692,6 +692,60 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?com(([,: ]|\)).*)?$", + r"\1COM\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?com(([,: ]|\)).*)?$", + r"\1COM\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?com(([,: ]|\)).*)?$", + r"\1COM\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?net(([,: ]|\)).*)?$", + r"\1NET\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?org(([,: ]|\)).*)?$", + r"\1ORG\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?org(([,: ]|\)).*)?$", + r"\1ORG\3", + line + ) + + line = re.sub( + r"^(!.*([, ]|\()[a-z0-9-]{2,}) ?\. ?org(([,: ]|\)).*)?$", + r"\1ORG\3", + line + ) + + line = re.sub( + r"^.*\$:.*$", + r"", + line + ) + + line = re.sub( + r"^.*hid[ie].*Adblock Plus.*$", + r"", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\n' @@ -1506,6 +1560,18 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^.*\$:.*$", + r"", + line + ) + + line = re.sub( + r"^.*hid[ie].*Adblock Plus.*$", + r"", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt index 05f1797a7..ea0b98076 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt @@ -1,14 +1,14 @@ [Adblock Plus 3.15] ! Title: Dandelion Sprout's AdGuard Home Compilation List - Web Push Notifications ! Contains modified entries from: Fanboy's Notifications Blocking List, and AdGuard Annoyances Web Push, alongside extra entries that are not part of those 2 lists. -! Version: 09January2025v1-Beta +! Version: 27February2025v1-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, AdGuard Annoyances Web Push's contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), while Fanboy's Notifications Blocking List whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are Ryan Brown (Fanboy's Notifications Blocking List) and AdGuard Software Limited (AdGuard Annoyances Web Push). ! Description: AdGuard Home is one of the tools for the future. However, its current internal structure discards virtually every $-using block rule, which makes various major lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. ! Note: If a list update is needed quickly, check out the instructions at https://github.com/DandelionSprout/adfilt/blob/master/AdGuard%20Home%20Compilation%20List/README.md ! —————————————————————————————————————————————— ! • Custom entries added by Dandelion Sprout • -! Section last updated: 9 January 2025 +! Section last updated: 27 February 2025 |push.delivery. |push-notifications. ||potisni.me^ @@ -60,10 +60,11 @@ |webpushnotifications. |wonderpush. |api.growthrx.in^ +||notif.generation-nt.com^ ! ————————————————————————————————————————————— -! Version: 202501090621 +! Version: 202502271211 ! Title: Fanboy's Notifications Blocking List -! Last modified: 09 Jan 2025 06:21 UTC +! Last modified: 27 Feb 2025 12:11 UTC ! License: https://creativecommons.org/licenses/by/3.0/ ! Email: easylist@protonmail.com ! Homepage: https://easylist.to/ @@ -75,10 +76,12 @@ |push-worker- !------------------------General element hiding rules-------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_general_hide.txt *** +! substack !-------------------------Third-party blocking rules--------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_thirdparty.txt *** ! fanboy_notifications_thirdparty.txt ||api-push.com^ +||bildirimat.com^ ||bildirnet.com^ ||braze.com^ ||cappushino.com^ @@ -95,6 +98,7 @@ ||getnotification.me^ ||irpush.com^ ||krakenoptimize.com^ +||larapush.com^ ||linker.hr^ ||luravius.com^ ||neopush.io^ @@ -273,6 +277,8 @@ ||sdk.chirpyweb.com^ .vafrike.ru^ ! `window.wpnConfig` +||speraspace.com^ +||sendpush.net^ ||personaclick.com^ ||quickalert.org^ ||ziwelatum.com^ @@ -281,7 +287,6 @@ ||pushmoose.com^ ||cdn-server.live^ ||widgets.*.webengage.com^ -||cdn.larapush.com^ ||nadajotum.com^ ||vokayatus.com^ ||migineg.com^