diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 05b14a789..0d7ebba6a 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -998,11 +998,23 @@ def prepare_ip(lines) -> str: ) line = re.sub( - r"^#[a-z0-9#]", + r"^#[a-z0-9#].*", "", line ) + line = re.sub( + r".*dmcdn\..*", + r"", + line + ) + + line = re.sub( + r"^[a-z.#%$[].*", + r"", + line + ) + if is_supported_ip(line) and not line == '': text += line + '\r\n' @@ -1522,6 +1534,12 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r".*dmcdn\..*", + r"", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\r\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index e1f3d8101..812412616 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List -! Version: 01April2022v1-Beta +! Version: 01April2022v2-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, all of the borrowed lists' contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), except for Liste FR's and Liste AR's entries which are to be treated as CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/), and RU AdList 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 The EasyList Authors (EasyList^³, Adblock Warning Removal List), Raymond Hill (uBlock Filters^²), AdGuard Software Limited (AdGuard Base Filter, AdGuard French Filter), smed79 (Liste AR), Daniel Kladnik (I Don't Care About Cookies), monztA & friends (ABP Anti-Circumvention Filters), and Lain13 & Dimisa (RU AdList). ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule (e.g. EasyList), which makes EasyList and similar 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. @@ -13,9 +13,9 @@ ! To seemingly unbreak Nintendo Switch online games @@||104.198.251.169 ! —————————————————————————————————————————————— -! Version: 202204010605 +! Version: 202204010615 ! Title: EasyList without element hiding rules -! Last modified: 01 Apr 2022 06:05 UTC +! Last modified: 01 Apr 2022 06:15 UTC ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html ! Please report any unblocked adverts or problems @@ -36323,9 +36323,9 @@ Banner468x60 ! *** easylistgermany:easylistgermany/easylistgermany_allowlist.txt *** ! *** easylistgermany:easylistgermany/easylistgermany_allowlist_dimensions.txt *** ! *** easylistgermany:easylistgermany/easylistgermany_allowlist_popup.txt *** -! Version: 202204010604 +! Version: 202204010614 ! Title: ABP filters -! Last modified: 01 Apr 2022 06:04 UTC +! Last modified: 01 Apr 2022 06:14 UTC ! Homepage: https://github.com/abp-filters/abp-filters-anti-cv ! Filter list designed to fight circumvention ads (including, in some cases, their tracking) and fix critical issues for Adblock Plus users ! Please report any issues diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt index bca8a8166..e4147c058 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationListIPs.txt @@ -3,7 +3,7 @@ ! Expires: 14 days ! 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: 29January2022v1-Alpha +! Version: 01April2022v1-Alpha 23.109.87.42 142.91.159.0/24 213.32.115.0/24 @@ -50,6 +50,7 @@ 35.238.205.163 91.241.60.117 91.241.60.119 +134.122.122.217 146.59.188.42 35.193.89.147 35.188.14.213