Add files via upload

2026-09-24 18:40:23 +01:00 · 2022-12-20 03:44:15 +01:00
parent ad08a3396c
commit 169d1a234b
4 changed files with 884 additions and 640 deletions
@@ -1371,7 +1371,7 @@ if __name__ == "__main__":
 import requests
 import re

-SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AdGuard%20Home%20Compilation%20List/TopDescription-Notifications.notlist', 'https://easylist-downloads.adblockplus.org/fanboy-notifications.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/Popups/sections/push-notifications_general.txt']
+SOURCES = ['https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AdGuard%20Home%20Compilation%20List/TopDescription-Notifications.notlist', 'https://easylist-downloads.adblockplus.org/fanboy-notifications.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/Popups/sections/push-notifications_general.txt', 'https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/Popups/sections/push-notifications_specific.txt']

 UNSUPPORTED_AGH = ['##', '@#', '#?#', '#%#', '!+', 'domain=', 'generichide', '$ghide', ',ghide', '$csp', 'xmlhttprequest', '$xhr', '$stylesheet', '$elemhide', '$inline-script', '$other', '$~object', 'redirect=', '#$#', '$domain', ',domain', '[Adblock Plus 2.0]', 'CV-']

@@ -1884,6 +1884,12 @@ def prepare_agh(lines) -> str:
           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: 15December2022v1-Beta
+! Version: 20December2022v1-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, 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: 202212150841
+! Version: 202212200211
 ! Title: Fanboy's Notifications Blocking List
-! Last modified: 15 Dec 2022 08:41 UTC
+! Last modified: 20 Dec 2022 02:11 UTC
 ! License: http://creativecommons.org/licenses/by/3.0/
 ! Email: easylist@protonmail.com
 ! Homepage: https://easylist.to/
@@ -556,4 +556,21 @@
 ||you-just-won-prize.com^
 ||yourbestru.site^
 ||z6uc8er1mzx8n2qd.pro^
-||zorbanmat.com^
+||zorbanmat.com^
+! NOTE: Generic rules end ⬆️
+! !SECTION: Push notifications - Generic rules
+! SECTION: Push notifications - Popular rules
+! Title: AdGuard Annoyances Web Push
+! Homepage: https://github.com/AdguardTeam/AdguardFilters/tree/master/AnnoyancesFilter/sections
+! Sourced from: https://raw.githubusercontent.com/AdguardTeam/AdguardFilters/master/AnnoyancesFilter/sections/push-notifications.txt
+! Currently unsupported - 'denied'
+%#//scriptlet("set-constant", "Notification.permission", "denied")
+! NOTE: Specific end ⬆️
+! !SECTION: Push notifications - Popular rules
+! SECTION: Push notifications - Regular rules
+||push.englishraven.com^
+||push-parking.inzhener-info.ru^
+||pp.teksty-pesenok.ru^
+||gu7socdn.txxx.com^
+! NOTE: Regular rules end ⬆️
+! !SECTION: Push notifications - Regular rules
@@ -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: 13December2022v1-Alpha
+! Version: 20December2022v1-Alpha
 23.109.87.42
 142.91.159.0/24
 213.32.115.0/24
@@ -56,72 +56,10 @@
 146.190.12.4
 188.72.219.36
 117.254.84.212:3000
-108.163.194.100
-13.208.241.250
-138.197.81.16
-145.239.218.240
-146.148.85.61
-163.172.16.147
-178.162.205.67
-178.175.132.130
-178.33.220.81
-188.72.206.0/24
 198.16.64.66
 213.206.98.70
-31.7.60.66
-37.46.192.170
-46.101.101.204
-46.101.125.0/24
-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
-91.210.165.104
-95.211.211.158
-185.165.169.108
-45.32.105.134
-77.162.125.199
-107.191.46.37
-108.61.209.24
-109.206.180.190
-109.234.38.0/24
-109.236.83.0/24
-138.68.82.192
-148.163.101.199
-159.65.203.16
-162.210.198.134
-162.215.254.42
-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
-34.250.229.112
-37.187.248.215
-45.120.80.107
-45.195.71.249
-45.32.147.99
-45.77.61.11
-46.101.139.152
-5.135.12.64
-5.39.67.191
-51.68.161.25
-52.51.50.245
-54.200.58.62
 62.212.73.45
-94.23.210.144
-94.23.251.46
 85.114.133.62
 130.211.212.60
 176.114.0.131
@@ -132,4 +70,4 @@
 62.109.18.206
 95.213.229.88
 95.213.231.34
-35.193.89.147
+35.193.89.147