mirror of
https://github.com/DandelionSprout/adfilt.git
synced 2026-10-05 19:11:12 +01:00
Very big December 2022 update
This commit is contained in:
Imre Kristoffer Eilertsen
@@ -894,6 +894,12 @@ def prepare_agh(lines) -> str:
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^\|\|dyndns\.$",
|
||||
r"",
|
||||
line
|
||||
)
|
||||
|
||||
# $badfilter-ed entries, as Sublime Text kept complaining about "Ran out of stack space" when I tried to semi-automate it with RegEx.
|
||||
|
||||
line = re.sub(
|
||||
@@ -902,6 +908,24 @@ def prepare_agh(lines) -> str:
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^\|.*[a-zA-Z0-9]\|[|a-zA-Z0-9].*",
|
||||
r"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^!!.*",
|
||||
r"",
|
||||
line
|
||||
)
|
||||
|
||||
line = re.sub(
|
||||
r"^! \[.*",
|
||||
r"",
|
||||
line
|
||||
)
|
||||
|
||||
if is_supported_agh(line) and not line == '':
|
||||
text += line + '\r\n'
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
[Adblock Plus 3.4]
|
||||
! 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
|
||||
! Version: 01October2022v1-Beta
|
||||
! Version: 06December2022v1-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).
|
||||
! 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 has a loose CC BY 3.0 that 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, 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, 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.
|
||||
! ——————————————————————————————————————————————
|
||||
! Version: 202210010751
|
||||
! Version: 202212060751
|
||||
! Title: Fanboy's Notifications Blocking List
|
||||
! Last modified: 01 Oct 2022 07:51 UTC
|
||||
! Last modified: 06 Dec 2022 07:51 UTC
|
||||
! License: http://creativecommons.org/licenses/by/3.0/
|
||||
! Please report any unblocked content or problems by email or in our forums
|
||||
! Email: easylist@protonmail.com
|
||||
@@ -93,7 +93,6 @@
|
||||
||luravius.com^
|
||||
||neopush.io^
|
||||
||news2day.me^
|
||||
||nextpsh.top^
|
||||
||notification-time.com^
|
||||
||notification.tubecup.net^
|
||||
||notix.io^
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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: 01October2022v1-Alpha
|
||||
! Version: 06December2022v1-Alpha
|
||||
23.109.87.42
|
||||
142.91.159.0/24
|
||||
213.32.115.0/24
|
||||
@@ -11,6 +11,7 @@
|
||||
51.195.31.0/24
|
||||
162.252.214.4
|
||||
167.99.31.227
|
||||
203.195.121.11
|
||||
23.109.87.101
|
||||
35.232.188.118
|
||||
37.1.209.213
|
||||
@@ -32,6 +33,7 @@
|
||||
51.89.187.143
|
||||
167.206.10.148
|
||||
142.91.159.107
|
||||
143.244.184.39
|
||||
146.59.223.83
|
||||
176.31.68.242
|
||||
185.147.34.126
|
||||
@@ -51,22 +53,11 @@
|
||||
35.238.205.163
|
||||
91.241.60.117
|
||||
91.241.60.119
|
||||
165.227.90.228
|
||||
146.59.188.42
|
||||
35.193.89.147
|
||||
35.188.14.213
|
||||
35.184.169.188
|
||||
78.140.130.88
|
||||
23.236.55.237
|
||||
130.211.230.53
|
||||
178.17.164.58
|
||||
78.140.130.91
|
||||
146.190.12.4
|
||||
188.72.219.36
|
||||
203.94.227.140
|
||||
203.94.248.40
|
||||
117.254.84.212:3000
|
||||
35.239.57.233
|
||||
108.163.194.100
|
||||
13.208.241.250
|
||||
138.197.81.16
|
||||
145.239.218.240
|
||||
146.148.85.61
|
||||
@@ -84,6 +75,8 @@
|
||||
46.249.58.117
|
||||
74.117.179.63
|
||||
77.247.181.115
|
||||
78.140.130.88
|
||||
78.140.130.91
|
||||
85.116.37.142
|
||||
85.170.167.205
|
||||
89.185.33.51
|
||||
@@ -105,10 +98,12 @@
|
||||
162.243.200.63
|
||||
162.243.87.218
|
||||
164.132.171.89
|
||||
172.255.6.0/24
|
||||
188.165.253.6
|
||||
194.182.75.43
|
||||
194.88.104.61
|
||||
217.23.1.125
|
||||
23.236.55.237
|
||||
25.115.187.96
|
||||
25.131.85.202
|
||||
25.52.111.246
|
||||
@@ -133,14 +128,8 @@
|
||||
35.184.188.211
|
||||
104.198.76.219
|
||||
35.178.185.67
|
||||
185.180.196.178
|
||||
5.101.115.170
|
||||
5.101.117.198
|
||||
62.109.18.206
|
||||
62.210.94.26
|
||||
88.85.75.147
|
||||
95.213.229.88
|
||||
95.213.231.34
|
||||
0.13.75.226
|
||||
37.59.72.131
|
||||
46.151.209.69
|
||||
35.193.89.147
|
||||
|
||||
Reference in New Issue
Block a user