diff --git a/adblocker-rules.template b/adblocker-rules.template index 2aaf20667..2e8e06bf4 100644 --- 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 index 1405f1d2b..4b21d3781 100644 --- 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 index 381ccec64..76b540c90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,24 +1,28 @@ { "name": "adblocker-rules", + "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "adblocker-rules", + "version": "1.0.0", + "license": "ISC", "dependencies": { "init": "^0.1.2" }, "devDependencies": { - "@adguard/aglint": "^2.1.1" + "@adguard/aglint": "^2.1.3" } }, "node_modules/@adguard/aglint": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@adguard/aglint/-/aglint-2.1.1.tgz", - "integrity": "sha512-Q7c7A9obUcIhmxG7b1iWHahAZ/rhdg/G+1AWDy3wzKrWfWLdnMSLj1Zd26cOAjmNMwsblldWw2HuDc+Kbvt66Q==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@adguard/aglint/-/aglint-2.1.3.tgz", + "integrity": "sha512-n5GQ6cCblGuzNZHgonCmswMqWDUsct2uDAsSNtdD5oJCZZcALYLj8mD0PgyGRy2XpXkMjwU4gItO58I9Pyyq6w==", "dev": true, "license": "MIT", "dependencies": { - "@adguard/agtree": "^2.0.2", + "@adguard/agtree": "^2.3.0", "@adguard/ecss-tree": "^1.1.0", "@inquirer/checkbox": "^1.3.7", "@inquirer/select": "^1.2.7", @@ -44,9 +48,9 @@ } }, "node_modules/@adguard/agtree": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@adguard/agtree/-/agtree-2.1.3.tgz", - "integrity": "sha512-Kf429Mq1cBtgOPbCtZH1cNI50DxKuZaS8LnzxPZc8pW+ZPWbUu6LAVSZ87791Dz7RxV5K0MsQsP8Iiqq8VFdKQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@adguard/agtree/-/agtree-2.3.0.tgz", + "integrity": "sha512-MeaTncLxXh/ERIXYAOZMEG7TTtYfxyGPIwS4Eb6sqM3kvgaCsIKRAOEDqbMHaYrtR9KBX+l5MlsdTKdkaD3SgA==", "dev": true, "license": "MIT", "dependencies": { @@ -57,7 +61,6 @@ "semver": "^7.5.3", "sprintf-js": "^1.1.3", "tldts": "^5.7.112", - "xregexp": "^5.1.1", "zod": "3.21.4" }, "engines": { @@ -81,20 +84,6 @@ "css-tree": "^2.3.1" } }, - "node_modules/@babel/runtime-corejs3": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.26.0.tgz", - "integrity": "sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-js-pure": "^3.30.2", - "regenerator-runtime": "^0.14.0" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@inquirer/checkbox": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.5.2.tgz", @@ -309,18 +298,6 @@ "node": ">=16" } }, - "node_modules/core-js-pure": { - "version": "3.39.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.39.0.tgz", - "integrity": "sha512-7fEcWwKI4rJinnK+wLTezeg2smbFFdSBP6E2kQZNbnzM2s1rpKQ6aaRteZSSg7FLU3P0HGGVo/gbpfanU36urg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/css-tree": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", @@ -564,13 +541,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true, - "license": "MIT" - }, "node_modules/run-async": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz", @@ -778,16 +748,6 @@ "node": ">=8" } }, - "node_modules/xregexp": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-5.1.1.tgz", - "integrity": "sha512-fKXeVorD+CzWvFs7VBuKTYIW63YD1e1osxwQ8caZ6o1jg6pDAbABDG54LCIq0j5cy7PjRvGIq6sef9DYPXpncg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/runtime-corejs3": "^7.16.5" - } - }, "node_modules/zod": { "version": "3.21.4", "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz", diff --git a/package.json b/package.json index 6de0fe8a5..bafd0197f 100644 --- 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 index fdabde3c1..c47f2e6c7 100644 --- 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 index 056acffc0..3a363af70 100644 --- 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 index 30bef3797..16254b986 100644 --- 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 index b6e78868e..8c5526303 100644 --- 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 index 5851b9824..2d8a818ce 100644 --- 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 index decc1844b..22d0704bf 100644 --- 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 index 84a351157..333eee55e 100644 --- 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 index e610c404b..7ffa43008 100644 --- 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 index 7277ee7d8..621dfd141 100644 --- 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 index 8834be3f6..04f263041 100644 --- 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 index 00253681c..ddd7f9770 100644 --- 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 index 607a0ecc4..ddcd3ea95 100644 --- 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 index 8aa504d7b..85146fb74 100644 --- 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 index 24d2c08ae..28a66034b 100644 --- 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. diff --git a/rules/noise.txt b/rules/noise.txt index fafa90776..245ab5d3c 100644 --- a/rules/noise.txt +++ b/rules/noise.txt @@ -1,36 +1,12 @@ -[Adblock Plus 2.0] -! Title: Spirillen's – Noise Filters -! Expires: 1 hours +[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/noise.txt ! -! License: -! https://github.com/mypdns/adblocker-rules/blob/master/LICENSE.md -! Homepage: https://github.com/mypdns/adblocker-rules -! -! Please report any unblocked content or problems on the Issue board. -! GitHub issues: -! - https://github.com/mypdns/adblocker-rules/issues -! Merge Request: -! - https://github.com/mypdns/adblocker-rules/pulls -! -! Email: -! - 0xacab+my-privacy-dns-matrix-4707-issue-@riseup.net -! -! CopyRight: -! - https://mypdns.org/spirillen -! - https://gitlab.com/spirillen -! - https://github.com/spirillen -! - https://matrix.rocks/@spirillen -! - https://bitbucket.org/spirillen/ -! - https://spirillen.atlassian.net/wiki/people/5bb90b589ba2930990f81dcd -! - https://spirillen.youtrack.cloud/users/spirillen -! - https://marsupilami.jetbrains.space/m/spirillen -! - https://spirillen.jetbrains.space/m/spirillen -! - The individual lists maintainers -! - The individual contributor -! - https://github.com/mypdns/adblocker-rules/activity - ! WARNING!!!! ! Notice, The following filters, WILL bring the sites down from fully function diff --git a/rules/privacy_domain.txt b/rules/privacy_domain.txt index 1a8076d79..e9b75a95a 100644 --- a/rules/privacy_domain.txt +++ b/rules/privacy_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/privacy.domain -! -%include ublockorigin-rules:template_header.txt% ! 0. diff --git a/rules/privacy_rules.txt b/rules/privacy_rules.txt index e1b92794e..871cb785a 100644 --- a/rules/privacy_rules.txt +++ b/rules/privacy_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/spyware_rule.blacklist -! -%include ublockorigin-rules:template_header.txt% ! 0. @@ -128,6 +128,7 @@ serverfault.com,superuser.com,stackoverflow.com,askubuntu.com,stackexchange.com# /metrika/watch.js @@||mypdns.github.io/adblocker-rules/*$xhr ||mypdns.*^$all,domain=~mypdns.org,to=~mypdns.org +||mypdns.*^$all,domain=~mypdns.youtrack.cloud,,to=~mypdns.youtrack.cloud ! N. /noui/eventlogger.js diff --git a/rules/whitelist_domain.txt b/rules/whitelist_domain.txt index bc301fafc..5d49265b6 100644 --- a/rules/whitelist_domain.txt +++ b/rules/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/whitelist_domain.whitelist -! -%include ublockorigin-rules:template_header.txt% ! 0. diff --git a/rules/whitelist_rule.txt b/rules/whitelist_rule.txt index 61209e52f..57df8f3e1 100644 --- a/rules/whitelist_rule.txt +++ b/rules/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/whitelist_rule.whitelist -! -%include ublockorigin-rules:template_header.txt% ! 0. diff --git a/template_header.txt b/template_header.txt index 19ba3f68c..1ab9932dc 100644 --- a/template_header.txt +++ b/template_header.txt @@ -8,22 +8,13 @@ ! My Privacy DNS issues: ! - https://github.com/mypdns/adblocker-rules/issues ! -! Merge Request: -! - https://github.com/mypdns/adblocker-rules/pulls -! ! Email: -! - 0xacab+my-privacy-dns-matrix-4707-issue-@riseup.net +! - spirillen@riseup.net ! ! CopyRight: ! - https://mypdns.org/spirillen -! - https://gitlab.com/spirillen ! - https://github.com/spirillen ! - https://gitlab.com/spirillen -! - https://bitbucket.org/spirillen/ -! - https://spirillen.atlassian.net/wiki/people/5bb90b589ba2930990f81dcd -! - https://spirillen.youtrack.cloud/users/spirillen -! - https://marsupilami.jetbrains.space/m/spirillen -! - https://spirillen.jetbrains.space/m/spirillen ! - The individual lists maintainers ! - The individual contributor ! https://github.com/mypdns/adblocker-rules/activity