Aglint code

Signed-off-by: Spirillen <[email protected]>
mypdns · Jan 14, 2025 · 9c403fd · 9c403fd
1 parent 531fe31
commit 9c403fd
Show file tree

Hide file tree

Showing 24 changed files with 93 additions and 165 deletions.
diff --git a/adblocker-rules.template b/adblocker-rules.template
@@ -1,4 +1,4 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 !
 ! BuildID:
 !

diff --git a/docs/python-abp.rst b/docs/python-abp.rst
@@ -153,7 +153,7 @@ to read a filter list (we use Python 3 syntax here but the API is the same):
 
 If ``filterlist.txt`` contains this filter list::
 
-    [Adblock Plus 2.0]
+    [uBlock Origin]
     ! Title: Example list
 
     abc.com,cdf.com##div#ad1

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,21 +2,21 @@
   "dependencies": {
     "init": "^0.1.2"
   },
-    "devDependencies": {
-        "@adguard/aglint": "^2.1.1"
-    },
-    "name": "adblocker-rules",
-    "version": "1.0.0",
-    "description": "[![uBlock syntax](_public/icons/ublock-origin-syntax.svg)](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax) [![AdGuard syntax](_public/icons/adguard-syntax.svg)](https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters) [![ko-fi](_public/icons/ko-fi.png)](https://ko-fi.com/X8X37FUGU) [![Donate](_public/icons/donate.png)](https://github.com/mypdns/matrix/blob/master/DONATION.md) [![My Privacy DNS](_public/icons/logo-h128.png)](https://github.com/mypdns/matrix \"This project is part of My Privacy DNS\")",
-    "main": "index.js",
-    "directories": {
-        "doc": "docs"
-    },
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "lint": "aglint"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC"
+  "devDependencies": {
+    "@adguard/aglint": "^2.1.3"
+  },
+  "name": "adblocker-rules",
+  "version": "1.0.0",
+  "description": "[![uBlock syntax](_public/icons/ublock-origin-syntax.svg)](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax) [![AdGuard syntax](_public/icons/adguard-syntax.svg)](https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters) [![ko-fi](_public/icons/ko-fi.png)](https://ko-fi.com/X8X37FUGU) [![Donate](_public/icons/donate.png)](https://github.com/mypdns/matrix/blob/master/DONATION.md) [![My Privacy DNS](_public/icons/logo-h128.png)](https://github.com/mypdns/matrix \"This project is part of My Privacy DNS\")",
+  "main": "index.js",
+  "directories": {
+    "doc": "docs"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "aglint"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
 }
diff --git a/rules/adult_domain.txt b/rules/adult_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
 %include ublockorigin-rules:template_header.txt%
 !
 ! List url:
-! https://github.com/mypdns/adblocker-rules/blob/master/rules/adult_domain.blacklist
+! https://github.com/mypdns/adblocker-rules/raw/master/rules/adult_domain.txt
 
 ! 0.
 0000114.com##[src^="/ads123/"]

diff --git a/rules/adult_rule.txt b/rules/adult_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
-! List url:
-! https://github.com/mypdns/adblocker-rules/blob/master/rules/adult_rule.blacklist
-!
 %include ublockorigin-rules:template_header.txt%
+!
+! List url:
+! https://github.com/mypdns/adblocker-rules/raw/master/rules/adult_rule.txt
 
 ! 0.
 

diff --git a/rules/adware_domain.txt b/rules/adware_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/adware_domain.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/adware_rule.txt b/rules/adware_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/adware_rule.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/annoyance_domain.txt b/rules/annoyance_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/annoyance_domain.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/annoyance_rule.txt b/rules/annoyance_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/annoyance_rule.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/anti_social_domain.txt b/rules/anti_social_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/rules/anti_social_domain.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/anti_social_rule.txt b/rules/anti_social_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/anti_social_rule.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/anti_whitelist_domain.txt b/rules/anti_whitelist_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/anti_whitelist_domain.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/anti_whitelist_rule.txt b/rules/anti_whitelist_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/anti_whitelist_rule.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/cookie_domain.txt b/rules/cookie_domain.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/cookie_domain.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/cookie_rule.txt b/rules/cookie_rule.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/cookie_rule.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/domain_piracy_rules.txt b/rules/domain_piracy_rules.txt
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/domain_piracy_rules.blacklist
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.
 

diff --git a/rules/new_filter.template b/rules/new_filter.template
@@ -1,11 +1,11 @@
-[Adblock Plus 2.0]
+[uBlock Origin]
 ! Title: My Privacy DNS
 ! Last modified: %timestamp%
 ! Expires: 1 hours (update frequency)
+%include ublockorigin-rules:template_header.txt%
+!
 ! List url:
 ! https://github.com/mypdns/adblocker-rules/blob/master/rules/new_filter.template
-!
-%include ublockorigin-rules:template_header.txt%
 
 ! 0.