From 65b6753c695f4696efd2974d4fb15ddea8d2fde9 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 14 Mar 2024 10:20:25 -0400 Subject: [PATCH] Simpler to use an extra property than to use a new assets.json --- assets/assets.1.57.json | 903 ---------------------------------- assets/assets.dev.json | 21 +- assets/assets.json | 152 +++--- platform/mv3/make-rulesets.js | 2 +- src/js/3p-filters.js | 13 +- src/js/background.js | 2 +- tools/make-assets.sh | 2 - tools/make-mv3.sh | 2 +- 8 files changed, 101 insertions(+), 996 deletions(-) delete mode 100644 assets/assets.1.57.json diff --git a/assets/assets.1.57.json b/assets/assets.1.57.json deleted file mode 100644 index f58c57c29..000000000 --- a/assets/assets.1.57.json +++ /dev/null @@ -1,903 +0,0 @@ -{ - "assets.json": { - "content": "internal", - "updateAfter": 13, - "contentURL": [ - "https://raw.githubusercontent.com/gorhill/uBlock/master/assets/assets.1.57.json", - "assets/assets.1.57.json" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/ublock/assets.1.57.json", - "https://ublockorigin.pages.dev/ublock/assets.1.57.json", - "https://cdn.jsdelivr.net/gh/gorhill/uBlock@master/assets/assets.1.57.json", - "https://cdn.statically.io/gh/gorhill/uBlock/master/assets/assets.1.57.json" - ] - }, - "public_suffix_list.dat": { - "content": "internal", - "updateAfter": 19, - "contentURL": [ - "https://publicsuffix.org/list/public_suffix_list.dat", - "assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat" - ] - }, - "ublock-badlists": { - "content": "internal", - "updateAfter": 29, - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/badlists.txt", - "assets/ublock/badlists.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/badlists.txt", - "https://ublockorigin.pages.dev/filters/badlists.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badlists.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badlists.txt" - ] - }, - "ublock-filters": { - "content": "filters", - "group": "default", - "parent": "uBlock filters", - "title": "uBlock filters – Ads", - "tags": "ads", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/filters.txt", - "assets/ublock/filters.min.txt", - "assets/ublock/filters.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/filters.min.txt", - "https://ublockorigin.pages.dev/filters/filters.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/filters.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/filters.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "ublock-badware": { - "content": "filters", - "group": "default", - "parent": "uBlock filters", - "title": "uBlock filters – Badware risks", - "tags": "malware security", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/badware.txt", - "assets/ublock/badware.min.txt", - "assets/ublock/badware.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/badware.min.txt", - "https://ublockorigin.pages.dev/filters/badware.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/badware.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/badware.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets", - "instructionURL": "https://github.com/gorhill/uBlock/wiki/Badware-risks" - }, - "ublock-privacy": { - "content": "filters", - "group": "default", - "parent": "uBlock filters", - "title": "uBlock filters – Privacy", - "tags": "privacy", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/privacy.txt", - "assets/ublock/privacy.min.txt", - "assets/ublock/privacy.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/privacy.min.txt", - "https://ublockorigin.pages.dev/filters/privacy.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/privacy.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/privacy.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "ublock-unbreak": { - "content": "filters", - "group": "default", - "parent": "uBlock filters", - "title": "uBlock filters – Unbreak", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/unbreak.txt", - "assets/ublock/unbreak.min.txt", - "assets/ublock/unbreak.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/unbreak.min.txt", - "https://ublockorigin.pages.dev/filters/unbreak.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/unbreak.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/unbreak.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "ublock-quick-fixes": { - "content": "filters", - "group": "default", - "parent": "uBlock filters", - "title": "uBlock filters – Quick fixes", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt", - "assets/ublock/quick-fixes.min.txt", - "assets/ublock/quick-fixes.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.min.txt", - "https://ublockorigin.pages.dev/filters/quick-fixes.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/quick-fixes.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "adguard-generic": { - "content": "filters", - "group": "ads", - "off": true, - "title": "AdGuard – Ads", - "tags": "ads", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "adguard-mobile": { - "content": "filters", - "group": "ads", - "off": true, - "title": "AdGuard – Mobile Ads", - "tags": "ads mobile", - "ua": "mobile", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "easylist": { - "content": "filters", - "group": "ads", - "title": "EasyList", - "tags": "ads", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt", - "assets/thirdparties/easylist/easylist.txt" - ], - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist.txt" - ], - "supportURL": "https://easylist.to/" - }, - "adguard-spyware-url": { - "content": "filters", - "group": "privacy", - "off": true, - "title": "AdGuard URL Tracking Protection", - "tags": "privacy", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/17.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "adguard-spyware": { - "content": "filters", - "group": "privacy", - "off": true, - "title": "AdGuard Tracking Protection", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "block-lan": { - "content": "filters", - "group": "privacy", - "off": true, - "title": "Block Outsider Intrusion into LAN", - "tags": "privacy security", - "contentURL": "https://ublockorigin.github.io/uAssets/filters/lan-block.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/lan-block.txt", - "https://ublockorigin.pages.dev/filters/lan-block.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/lan-block.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/lan-block.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "easyprivacy": { - "content": "filters", - "group": "privacy", - "title": "EasyPrivacy", - "tags": "privacy", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt", - "assets/thirdparties/easylist/easyprivacy.txt" - ], - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easyprivacy.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt", - "https://ublockorigin.pages.dev/thirdparties/easyprivacy.txt" - ], - "supportURL": "https://easylist.to/" - }, - "urlhaus-1": { - "content": "filters", - "group": "malware", - "title": "Online Malicious URL Blocklist", - "contentURL": [ - "https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-ag-online.txt", - "assets/thirdparties/urlhaus-filter/urlhaus-filter-online.txt" - ], - "cdnURLs": [ - "https://curbengh.github.io/malware-filter/urlhaus-filter-ag-online.txt", - "https://malware-filter.gitlab.io/urlhaus-filter/urlhaus-filter-ag-online.txt", - "https://malware-filter.pages.dev/urlhaus-filter-ag-online.txt" - ], - "supportURL": "https://gitlab.com/malware-filter/urlhaus-filter#malicious-url-blocklist" - }, - "curben-phishing": { - "content": "filters", - "group": "malware", - "off": true, - "title": "Phishing URL Blocklist", - "contentURL": "https://malware-filter.gitlab.io/phishing-filter/phishing-filter.txt", - "cdnURLs": [ - "https://curbengh.github.io/phishing-filter/phishing-filter.txt", - "https://malware-filter.gitlab.io/phishing-filter/phishing-filter.txt", - "https://phishing-filter.pages.dev/phishing-filter.txt" - ], - "supportURL": "https://gitlab.com/malware-filter/phishing-filter#phishing-url-blocklist" - }, - "adguard-cookies": { - "content": "filters", - "group": "cookies", - "parent": "AdGuard/uBO – Cookie Notices", - "off": true, - "title": "AdGuard – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/18.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "ublock-cookies-adguard": { - "content": "filters", - "group": "cookies", - "parent": "AdGuard/uBO – Cookie Notices", - "off": true, - "title": "uBlock filters – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt", - "https://ublockorigin.pages.dev/filters/annoyances-cookies.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "fanboy-cookiemonster": { - "content": "filters", - "group": "cookies", - "parent": "EasyList/uBO – Cookie Notices", - "off": true, - "title": "EasyList – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt", - "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt", - "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" - ], - "supportURL": "https://github.com/easylist/easylist#fanboy-lists" - }, - "ublock-cookies-easylist": { - "content": "filters", - "group": "cookies", - "parent": "EasyList/uBO – Cookie Notices", - "off": true, - "title": "uBlock filters – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt", - "https://ublockorigin.pages.dev/filters/annoyances-cookies.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "adguard-social": { - "content": "filters", - "group": "social", - "parent": null, - "off": true, - "title": "AdGuard – Social Widgets", - "tags": "annoyances social", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "fanboy-social": { - "content": "filters", - "group": "social", - "parent": null, - "off": true, - "title": "EasyList – Social Widgets", - "tags": "annoyances social", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt", - "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-social.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt", - "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" - ], - "supportURL": "https://easylist.to/" - }, - "fanboy-thirdparty_social": { - "content": "filters", - "group": "social", - "off": true, - "title": "Fanboy – Anti-Facebook", - "tags": "privacy", - "contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt", - "supportURL": "https://github.com/ryanbr/fanboy-adblock/issues" - }, - "adguard-popup-overlays": { - "content": "filters", - "group": "annoyances", - "parent": "AdGuard – Annoyances", - "off": true, - "title": "AdGuard – Popup Overlays", - "tags": "annoyances", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/19.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "adguard-mobile-app-banners": { - "content": "filters", - "group": "annoyances", - "parent": "AdGuard – Annoyances", - "off": true, - "title": "AdGuard – Mobile App Banners", - "tags": "annoyances mobile", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/20.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "adguard-other-annoyances": { - "content": "filters", - "group": "annoyances", - "parent": "AdGuard – Annoyances", - "off": true, - "title": "AdGuard – Other Annoyances", - "tags": "annoyances", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/21.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "adguard-widgets": { - "content": "filters", - "group": "annoyances", - "parent": "AdGuard – Annoyances", - "off": true, - "title": "AdGuard – Widgets", - "tags": "annoyances", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/22.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "easylist-annoyances": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances", - "off": true, - "title": "EasyList – Other Annoyances", - "tags": "annoyances", - "contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-annoyances.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-annoyances.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-annoyances.txt" - ], - "supportURL": "https://github.com/easylist/easylist#fanboy-lists" - }, - "easylist-chat": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances", - "off": true, - "title": "EasyList – Chat Widgets", - "tags": "annoyances", - "contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-chat.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-chat.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-chat.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-chat.txt" - ], - "supportURL": "https://github.com/easylist/easylist#fanboy-lists" - }, - "easylist-newsletters": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances", - "off": true, - "title": "EasyList – Newsletter Notices", - "tags": "annoyances", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-newsletters.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-newsletters.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-newsletters.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-newsletters.txt" - ], - "supportURL": "https://easylist.to/" - }, - "easylist-notifications": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances", - "off": true, - "title": "EasyList – Notifications", - "tags": "annoyances", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-notifications.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-notifications.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-notifications.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-notifications.txt" - ], - "supportURL": "https://easylist.to/" - }, - "ublock-annoyances": { - "content": "filters", - "group": "annoyances", - "off": true, - "title": "uBlock filters – Annoyances", - "tags": "annoyances", - "contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/annoyances.min.txt", - "https://ublockorigin.pages.dev/filters/annoyances.min.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances.min.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances.min.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, - "dpollock-0": { - "content": "filters", - "group": "multipurpose", - "updateAfter": 13, - "off": true, - "title": "Dan Pollock’s hosts file", - "tags": "ads privacy security", - "contentURL": "https://someonewhocares.org/hosts/hosts", - "supportURL": "https://someonewhocares.org/hosts/" - }, - "plowe-0": { - "content": "filters", - "group": "multipurpose", - "updateAfter": 13, - "title": "Peter Lowe’s Ad and tracking server list", - "tags": "ads privacy security", - "contentURL": [ - "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", - "assets/thirdparties/pgl.yoyo.org/as/serverlist.txt", - "assets/thirdparties/pgl.yoyo.org/as/serverlist" - ], - "supportURL": "https://pgl.yoyo.org/adservers/" - }, - "ALB-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇦🇱al 🇽🇰xk: Adblock List for Albania", - "tags": "ads albania shqipja", - "lang": "sq", - "contentURL": "https://raw.githubusercontent.com/AnXh3L0/blocklist/master/albanian-easylist-addition/Albania.txt", - "supportURL": "https://github.com/AnXh3L0/blocklist" - }, - "ara-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇪🇬eg 🇸🇦sa 🇲🇦ma 🇩🇿dz: Liste AR", - "tags": "ads arabic اَلْعَرَبِيَّةُ‎", - "lang": "ar", - "contentURL": "https://easylist-downloads.adblockplus.org/Liste_AR.txt", - "supportURL": "https://forums.lanik.us/viewforum.php?f=98" - }, - "BGR-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇧🇬bg: Bulgarian Adblock list", - "tags": "ads bulgarian България macedonian Македонија", - "lang": "bg mk", - "contentURL": "https://stanev.org/abp/adblock_bg.txt", - "supportURL": "https://stanev.org/abp/" - }, - "CHN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇨🇳cn 🇹🇼tw: AdGuard Chinese (中文)", - "tags": "ads chinese 中文", - "lang": "ug zh", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/224.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters" - }, - "CZE-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇨🇿cz 🇸🇰sk: EasyList Czech and Slovak", - "tags": "ads czech česká slovak slovenská", - "lang": "cs sk", - "contentURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt", - "supportURL": "https://github.com/tomasko126/easylistczechandslovak" - }, - "DEU-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇩🇪de 🇨🇭ch 🇦🇹at: EasyList Germany", - "tags": "ads german deutschland luxembourgish lëtzebuerg romansh", - "lang": "de dsb hsb lb rm", - "contentURL": [ - "https://easylist.to/easylistgermany/easylistgermany.txt", - "https://easylist-downloads.adblockplus.org/easylistgermany.txt" - ], - "supportURL": "https://forums.lanik.us/viewforum.php?f=90" - }, - "EST-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇪🇪ee: Eesti saitidele kohandatud filter", - "tags": "ads estonian", - "lang": "et", - "contentURL": "https://adblock.ee/list.php", - "supportURL": "https://adblock.ee/" - }, - "FIN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇫🇮fi: Adblock List for Finland", - "tags": "ads finnish", - "lang": "fi", - "contentURL": "https://raw.githubusercontent.com/finnish-easylist-addition/finnish-easylist-addition/gh-pages/Finland_adb.txt", - "supportURL": "https://github.com/finnish-easylist-addition/finnish-easylist-addition" - }, - "FRA-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇫🇷fr 🇨🇦ca: AdGuard Français", - "tags": "ads french", - "lang": "ar br ff fr lb oc son", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/16.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters" - }, - "GRC-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇬🇷gr 🇨🇾cy: Greek AdBlock Filter", - "tags": "ads greek", - "lang": "el", - "contentURL": "https://www.void.gr/kargig/void-gr-filters.txt", - "supportURL": "https://github.com/kargig/greek-adblockplus-filter" - }, - "HRV-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇭🇷hr 🇷🇸rs: Dandelion Sprout's Serbo-Croatian filters", - "tags": "ads croatian serbian", - "lang": "hr sr", - "contentURL": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/SerboCroatianList.txt", - "supportURL": "https://github.com/DandelionSprout/adfilt#readme" - }, - "HUN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇭🇺hu: hufilter", - "tags": "ads hungarian", - "lang": "hu", - "contentURL": "https://raw.githubusercontent.com/hufilter/hufilter/master/hufilter-ublock.txt", - "supportURL": "https://github.com/hufilter/hufilter" - }, - "IDN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇩id 🇲🇾my: ABPindo", - "tags": "ads indonesian malay", - "lang": "id ms", - "contentURL": "https://raw.githubusercontent.com/ABPindo/indonesianadblockrules/master/subscriptions/abpindo.txt", - "supportURL": "https://github.com/ABPindo/indonesianadblockrules" - }, - "IND-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇳in 🇱🇰lk 🇳🇵np: IndianList", - "tags": "ads assamese bengali gujarati hindi kannada malayalam marathi nepali punjabi sinhala tamil telugu", - "lang": "as bn gu hi kn ml mr ne pa si ta te", - "contentURL": "https://easylist-downloads.adblockplus.org/indianlist.txt", - "supportURL": "https://github.com/mediumkreation/IndianList" - }, - "IRN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇷ir: PersianBlocker", - "tags": "ads af ir persian pashto tajik tj", - "lang": "fa ps tg", - "contentURL": [ - "https://raw.githubusercontent.com/MasterKia/PersianBlocker/main/PersianBlocker.txt", - "https://cdn.statically.io/gh/MasterKia/PersianBlocker/main/PersianBlocker.txt" - ], - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/MasterKia/PersianBlocker@main/PersianBlocker.txt", - "https://cdn.statically.io/gh/MasterKia/PersianBlocker/main/PersianBlocker.txt" - ], - "supportURL": "https://github.com/MasterKia/PersianBlocker" - }, - "ISL-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇸is: Icelandic ABP List", - "tags": "ads icelandic", - "lang": "is", - "contentURL": "https://adblock.gardar.net/is.abp.txt", - "supportURL": "https://adblock.gardar.net/" - }, - "ISR-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇱il: EasyList Hebrew", - "tags": "ads hebrew", - "lang": "he", - "contentURL": "https://raw.githubusercontent.com/easylist/EasyListHebrew/master/EasyListHebrew.txt", - "supportURL": "https://github.com/easylist/EasyListHebrew" - }, - "ITA-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇮🇹it: EasyList Italy", - "tags": "ads italian", - "lang": "it lij", - "contentURL": "https://easylist-downloads.adblockplus.org/easylistitaly.txt", - "supportURL": "https://forums.lanik.us/viewforum.php?f=96" - }, - "JPN-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇯🇵jp: AdGuard Japanese", - "tags": "ads japanese 日本語", - "lang": "ja", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "KOR-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇰🇷kr: List-KR", - "tags": "ads korean 한국어", - "lang": "ko", - "contentURL": "https://cdn.jsdelivr.net/gh/List-KR/List-KR@latest/filter-uBlockOrigin.txt", - "supportURL": "https://github.com/List-KR/List-KR#readme" - }, - "LTU-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇱🇹lt: EasyList Lithuania", - "tags": "ads lithuanian", - "lang": "lt", - "contentURL": "https://raw.githubusercontent.com/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt", - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/EasyList-Lithuania/easylist_lithuania@master/easylistlithuania.txt", - "https://cdn.statically.io/gh/EasyList-Lithuania/easylist_lithuania/master/easylistlithuania.txt" - ], - "supportURL": "https://github.com/EasyList-Lithuania/easylist_lithuania" - }, - "LVA-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇱🇻lv: Latvian List", - "tags": "ads latvian", - "lang": "lv", - "contentURL": "https://raw.githubusercontent.com/Latvian-List/adblock-latvian/master/lists/latvian-list.txt", - "supportURL": "https://github.com/Latvian-List/adblock-latvian" - }, - "MKD-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇲🇰mk: Macedonian adBlock Filters", - "tags": "ads macedonian", - "lang": "mk", - "contentURL": "https://raw.githubusercontent.com/DeepSpaceHarbor/Macedonian-adBlock-Filters/master/Filters", - "supportURL": "https://github.com/DeepSpaceHarbor/Macedonian-adBlock-Filters" - }, - "NLD-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇳🇱nl 🇧🇪be: EasyDutch", - "tags": "ads afrikaans be belgië frisian dutch flemish nederlands netherlands nl sr suriname za", - "lang": "af fy nl", - "contentURL": "https://easydutch-ubo.github.io/EasyDutch/EasyDutch.txt", - "cdnURLs": [ - "https://easydutch-ubo.github.io/EasyDutch/EasyDutch.all.txt", - "https://cdn.jsdelivr.net/gh/EasyDutch-uBO/EasyDutch@gh-pages/EasyDutch.all.txt", - "https://cdn.statically.io/gh/EasyDutch-uBO/EasyDutch/gh-pages/EasyDutch.all.txt" - ], - "supportURL": "https://github.com/EasyDutch-uBO/EasyDutch/" - }, - "NOR-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇳🇴no 🇩🇰dk 🇮🇸is: Dandelion Sprouts nordiske filtre", - "tags": "ads norwegian danish icelandic", - "lang": "nb nn no da is", - "contentURL": [ - "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianList.txt" - ], - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/DandelionSprout/adfilt@master/NorwegianList.txt", - "https://cdn.statically.io/gl/DandelionSprout/adfilt/master/NorwegianList.txt" - ], - "supportURL": "https://github.com/DandelionSprout/adfilt" - }, - "POL-0": { - "content": "filters", - "group": "regions", - "parent": "🇵🇱pl: Oficjalne Polskie Filtry", - "off": true, - "title": "🇵🇱pl: Oficjalne Polskie Filtry do uBlocka Origin", - "tags": "ads polish polski", - "lang": "szl pl", - "contentURL": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt", - "supportURL": "https://github.com/MajkiIT/polish-ads-filter/issues", - "instructionURL": "https://github.com/MajkiIT/polish-ads-filter#polish-filters-for-adblock-ublock-origin--adguard" - }, - "POL-2": { - "content": "filters", - "group": "regions", - "parent": "🇵🇱pl: Oficjalne Polskie Filtry", - "off": true, - "title": "🇵🇱pl: Oficjalne polskie filtry przeciwko alertom o Adblocku", - "tags": "ads polish polski", - "lang": "szl pl", - "contentURL": "https://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/anti-adblock.txt", - "supportURL": "https://github.com/olegwukr/polish-privacy-filters/issues" - }, - "ROU-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇷🇴ro 🇲🇩md: Romanian Ad (ROad) Block List Light", - "tags": "ads romanian română moldavian moldovenească молдовеняскэ", - "lang": "ro", - "contentURL": [ - "https://raw.githubusercontent.com/tcptomato/ROad-Block/master/road-block-filters-light.txt" - ], - "supportURL": "https://github.com/tcptomato/ROad-Block" - }, - "RUS-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList", - "tags": "ads belarusian беларуская kazakh tatar russian русский ukrainian українська uzbek", - "lang": "be kk tt ru uk uz", - "contentURL": "https://raw.githubusercontent.com/easylist/ruadlist/master/RuAdList-uBO.txt", - "cdnURLs": [ - "https://cdn.jsdelivr.net/gh/dimisa-RUAdList/RUAdListCDN@main/lists/ruadlist.ubo.min.txt", - "https://cdn.statically.io/gh/dimisa-RUAdList/RUAdListCDN/main/lists/ruadlist.ubo.min.txt", - "https://raw.githubusercontent.com/dimisa-RUAdList/RUAdListCDN/main/lists/ruadlist.ubo.min.txt" - ], - "supportURL": "https://forums.lanik.us/viewforum.php?f=102", - "instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512" - }, - "spa-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇪🇸es 🇦🇷ar 🇲🇽mx 🇨🇴co: EasyList Spanish", - "tags": "ads aragonese basque catalan spanish español galician guarani", - "lang": "an ast ca cak es eu gl gn trs quz", - "contentURL": "https://easylist-downloads.adblockplus.org/easylistspanish.txt", - "supportURL": "https://forums.lanik.us/viewforum.php?f=103" - }, - "spa-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇪🇸es 🇦🇷ar 🇧🇷br 🇵🇹pt: AdGuard Spanish/Portuguese", - "tags": "ads aragonese basque catalan spanish español galician guarani portuguese português", - "lang": "an ast ca cak es eu gl gn trs pt quz", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "SVN-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇸🇮si: Slovenian List", - "tags": "ads slovenian slovenski", - "lang": "sl", - "contentURL": "https://raw.githubusercontent.com/betterwebleon/slovenian-list/master/filters.txt", - "supportURL": "https://github.com/betterwebleon/slovenian-list" - }, - "SWE-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇸🇪se: Frellwit's Swedish Filter", - "tags": "ads swedish svenska", - "lang": "sv", - "contentURL": "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/master/Frellwits-Swedish-Filter.txt", - "cdnURLs": [ - "https://raw.githubusercontent.com/lassekongo83/Frellwits-filter-lists/swefilter/swefilter.min.txt", - "https://cdn.jsdelivr.net/gh/lassekongo83/Frellwits-filter-lists@swefilter/swefilter.min.txt" - ], - "supportURL": "https://github.com/lassekongo83/Frellwits-filter-lists" - }, - "THA-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇹🇭th: EasyList Thailand", - "tags": "ads thai ไทย", - "lang": "th", - "contentURL": "https://raw.githubusercontent.com/easylist-thailand/easylist-thailand/master/subscription/easylist-thailand.txt", - "supportURL": "https://github.com/easylist-thailand/easylist-thailand" - }, - "TUR-0": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇹🇷tr: AdGuard Turkish", - "tags": "ads turkish türkçe", - "lang": "tr", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, - "VIE-1": { - "content": "filters", - "group": "regions", - "off": true, - "title": "🇻🇳vn: ABPVN List", - "tags": "ads vietnamese việt", - "lang": "vi", - "contentURL": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn_ublock.txt", - "supportURL": "https://abpvn.com/" - } -} diff --git a/assets/assets.dev.json b/assets/assets.dev.json index 533318108..55eaec3df 100644 --- a/assets/assets.dev.json +++ b/assets/assets.dev.json @@ -246,7 +246,8 @@ }, "adguard-cookies": { "content": "filters", - "group": "cookies", + "group": "annoyances", + "group2": "cookies", "parent": "AdGuard/uBO – Cookie Notices", "off": true, "title": "AdGuard – Cookie Notices", @@ -257,7 +258,8 @@ }, "ublock-cookies-adguard": { "content": "filters", - "group": "cookies", + "group": "annoyances", + "group2": "cookies", "parent": "AdGuard/uBO – Cookie Notices", "off": true, "title": "uBlock filters – Cookie Notices", @@ -273,7 +275,8 @@ }, "fanboy-cookiemonster": { "content": "filters", - "group": "cookies", + "group": "annoyances", + "group2": "cookies", "parent": "EasyList/uBO – Cookie Notices", "off": true, "title": "EasyList – Cookie Notices", @@ -293,7 +296,8 @@ }, "ublock-cookies-easylist": { "content": "filters", - "group": "cookies", + "group": "annoyances", + "group2": "cookies", "parent": "EasyList/uBO – Cookie Notices", "off": true, "title": "uBlock filters – Cookie Notices", @@ -309,7 +313,8 @@ }, "adguard-social": { "content": "filters", - "group": "social", + "group": "annoyances", + "group2": "social", "parent": null, "off": true, "title": "AdGuard – Social Widgets", @@ -320,7 +325,8 @@ }, "fanboy-social": { "content": "filters", - "group": "social", + "group": "annoyances", + "group2": "social", "parent": null, "off": true, "title": "EasyList – Social Widgets", @@ -340,7 +346,8 @@ }, "fanboy-thirdparty_social": { "content": "filters", - "group": "social", + "group": "annoyances", + "group2": "social", "off": true, "title": "Fanboy – Anti-Facebook", "tags": "privacy", diff --git a/assets/assets.json b/assets/assets.json index b885ccc58..6357a4815 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -244,17 +244,6 @@ ], "supportURL": "https://gitlab.com/malware-filter/phishing-filter#phishing-url-blocklist" }, - "adguard-social": { - "content": "filters", - "group": "annoyances", - "parent": "AdGuard – Annoyances", - "off": true, - "title": "AdGuard – Social Media", - "tags": "annoyances social", - "contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt", - "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", - "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" - }, "adguard-cookies": { "content": "filters", "group": "annoyances", @@ -282,6 +271,82 @@ ], "supportURL": "https://github.com/uBlockOrigin/uAssets" }, + "fanboy-cookiemonster": { + "content": "filters", + "group": "annoyances", + "parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices", + "off": true, + "title": "EasyList – Cookie Notices", + "tags": "annoyances cookies", + "contentURL": [ + "https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt", + "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" + ], + "cdnURLs": [ + "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt", + "https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt", + "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt", + "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt", + "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" + ], + "supportURL": "https://github.com/easylist/easylist#fanboy-lists" + }, + "ublock-cookies-easylist": { + "content": "filters", + "group": "annoyances", + "parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices", + "off": true, + "title": "uBlock filters – Cookie Notices", + "tags": "annoyances cookies", + "contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt", + "cdnURLs": [ + "https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt", + "https://ublockorigin.pages.dev/filters/annoyances-cookies.txt", + "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt", + "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt" + ], + "supportURL": "https://github.com/uBlockOrigin/uAssets" + }, + "adguard-social": { + "content": "filters", + "group": "annoyances", + "parent": "AdGuard – Annoyances", + "off": true, + "title": "AdGuard – Social Media", + "tags": "annoyances social", + "contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt", + "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", + "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" + }, + "fanboy-social": { + "content": "filters", + "group": "annoyances", + "parent": "EasyList – Annoyances", + "off": true, + "title": "EasyList – Social Widgets", + "tags": "annoyances social", + "contentURL": [ + "https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt", + "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" + ], + "cdnURLs": [ + "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt", + "https://ublockorigin.pages.dev/thirdparties/easylist-social.txt", + "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt", + "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt", + "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" + ], + "supportURL": "https://easylist.to/" + }, + "fanboy-thirdparty_social": { + "content": "filters", + "group": "annoyances", + "off": true, + "title": "Fanboy – Anti-Facebook", + "tags": "privacy", + "contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt", + "supportURL": "https://github.com/ryanbr/fanboy-adblock/issues" + }, "adguard-popup-overlays": { "content": "filters", "group": "annoyances", @@ -326,15 +391,6 @@ "supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters", "instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters" }, - "fanboy-thirdparty_social": { - "content": "filters", - "group": "annoyances", - "off": true, - "title": "Fanboy – Anti-Facebook", - "tags": "privacy", - "contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt", - "supportURL": "https://github.com/ryanbr/fanboy-adblock/issues" - }, "easylist-annoyances": { "content": "filters", "group": "annoyances", @@ -367,42 +423,6 @@ ], "supportURL": "https://github.com/easylist/easylist#fanboy-lists" }, - "fanboy-cookiemonster": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices", - "off": true, - "title": "EasyList – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt", - "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt", - "https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt" - ], - "supportURL": "https://github.com/easylist/easylist#fanboy-lists" - }, - "ublock-cookies-easylist": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices", - "off": true, - "title": "uBlock filters – Cookie Notices", - "tags": "annoyances cookies", - "contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt", - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt", - "https://ublockorigin.pages.dev/filters/annoyances-cookies.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt" - ], - "supportURL": "https://github.com/uBlockOrigin/uAssets" - }, "easylist-newsletters": { "content": "filters", "group": "annoyances", @@ -439,26 +459,6 @@ ], "supportURL": "https://easylist.to/" }, - "fanboy-social": { - "content": "filters", - "group": "annoyances", - "parent": "EasyList – Annoyances", - "off": true, - "title": "EasyList – Social Widgets", - "tags": "annoyances social", - "contentURL": [ - "https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt", - "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" - ], - "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt", - "https://ublockorigin.pages.dev/thirdparties/easylist-social.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt", - "https://secure.fanboy.co.nz/fanboy-social_ubo.txt" - ], - "supportURL": "https://easylist.to/" - }, "ublock-annoyances": { "content": "filters", "group": "annoyances", diff --git a/platform/mv3/make-rulesets.js b/platform/mv3/make-rulesets.js index a816e3cb4..4f79d52dd 100644 --- a/platform/mv3/make-rulesets.js +++ b/platform/mv3/make-rulesets.js @@ -1143,7 +1143,7 @@ async function main() { // Get assets.json content const assets = await fs.readFile( - `./assets.1.57.json`, + `./assets.json`, { encoding: 'utf8' } ).then(text => JSON.parse(text) diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js index 574180942..7ad45bed1 100644 --- a/src/js/3p-filters.js +++ b/src/js/3p-filters.js @@ -92,8 +92,9 @@ const renderFilterLists = ( ) => { const initializeListEntry = (listDetails, listEntry) => { const listkey = listEntry.dataset.key; + const groupkey = listDetails.group2 || listDetails.group; const listEntryPrevious = - qs$(`[data-key="${listDetails.group}"] [data-key="${listkey}"]`); + qs$(`[data-key="${groupkey}"] [data-key="${listkey}"]`); if ( listEntryPrevious !== null ) { if ( dom.cl.has(listEntryPrevious, 'checked') ) { dom.cl.add(listEntry, 'checked'); @@ -239,7 +240,7 @@ const renderFilterLists = ( ) => { }; } for ( const [ listkey, listDetails ] of Object.entries(response.available) ) { - let groupkey = listDetails.group; + let groupkey = listDetails.group2 || listDetails.group; if ( listTree.hasOwnProperty(groupkey) === false ) { groupkey = 'unknown'; } @@ -561,7 +562,8 @@ const selectFilterLists = async ( ) => { after.push(line); continue; } - const listEntry = qs$(`[data-key="${list.group}"] [data-key="${listkey}"]`); + const groupkey = list.group2 || list.group; + const listEntry = qs$(`[data-key="${groupkey}"] [data-key="${listkey}"]`); if ( listEntry === null ) { break; } toggleFilterList(listEntry, true); break; @@ -691,10 +693,11 @@ const searchFilterLists = ( ) => { if ( listDetails === undefined ) { continue; } let haystack = perListHaystack.get(listDetails); if ( haystack === undefined ) { + const groupkey = listDetails.group2 || listDetails.group || ''; haystack = [ listDetails.title, - listDetails.group || '', - i18nGroupName(listDetails.group || ''), + groupkey, + i18nGroupName(groupkey), listDetails.tags || '', toI18n(listDetails.tags || ''), ].join(' ').trim(); diff --git a/src/js/background.js b/src/js/background.js index 49612dbef..4033b73f0 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -213,7 +213,7 @@ const µBlock = { // jshint ignore:line assetsJsonPath: vAPI.webextFlavor.soup.has('devbuild') ? '/assets/assets.dev.json' - : '/assets/assets.1.57.json', + : '/assets/assets.json', userFiltersPath: 'user-filters', pslAssetKey: 'public_suffix_list.dat', diff --git a/tools/make-assets.sh b/tools/make-assets.sh index 1d08371d6..139abbf3a 100755 --- a/tools/make-assets.sh +++ b/tools/make-assets.sh @@ -14,12 +14,10 @@ cp -R ./assets $DES/ VERSION=$(cat ./dist/version) if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "*** Removing $DES/assets.dev.json" - rm -f $DES/assets.json rm -f $DES/assets.dev.json else echo "*** Removing $DES/assets.json" rm -f $DES/assets.json - rm -f $DES/assets.1.57.json fi mkdir $DES/thirdparties diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh index af8637423..13f82f4db 100755 --- a/tools/make-mv3.sh +++ b/tools/make-mv3.sh @@ -108,7 +108,7 @@ if [ "$QUICK" != "yes" ]; then cp platform/mv3/*.js "$TMPDIR"/ cp platform/mv3/*.mjs "$TMPDIR"/ cp platform/mv3/extension/js/utils.js "$TMPDIR"/js/ - cp "$UBO_DIR"/assets/assets.1.57.json "$TMPDIR"/ + cp "$UBO_DIR"/assets/assets.json "$TMPDIR"/ cp "$UBO_DIR"/assets/resources/scriptlets.js "$TMPDIR"/ cp -R platform/mv3/scriptlets "$TMPDIR"/ mkdir -p "$TMPDIR"/web_accessible_resources