From 7d321c0a11b193624886b257b31c37027c84023a Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 29 Mar 2024 10:23:07 -0400
Subject: [PATCH] Spin-off cookie notices/social widgets lists into own
 category

Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/3154
---
 assets/assets.json | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/assets/assets.json b/assets/assets.json
index 6357a4815..50131ec85 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -155,6 +155,7 @@
 		"group": "ads",
 		"title": "EasyList",
 		"tags": "ads",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
 			"assets/thirdparties/easylist/easylist.txt"
@@ -205,6 +206,7 @@
 		"group": "privacy",
 		"title": "EasyPrivacy",
 		"tags": "privacy",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
 			"assets/thirdparties/easylist/easyprivacy.txt"
@@ -247,7 +249,8 @@
 	"adguard-cookies": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "AdGuard/uBO – Cookie Notices",
 		"off": true,
 		"title": "AdGuard – Cookie Notices",
 		"tags": "annoyances cookies",
@@ -258,7 +261,8 @@
 	"ublock-cookies-adguard": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "AdGuard/uBO – Cookie Notices",
 		"off": true,
 		"title": "uBlock filters – Cookie Notices",
 		"tags": "annoyances cookies",
@@ -274,10 +278,12 @@
 	"fanboy-cookiemonster": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "EasyList/uBO – Cookie Notices",
 		"off": true,
 		"title": "EasyList – Cookie Notices",
 		"tags": "annoyances cookies",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
 			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
@@ -294,10 +300,12 @@
 	"ublock-cookies-easylist": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "EasyList/uBO – Cookie Notices",
 		"off": true,
 		"title": "uBlock filters – Cookie Notices",
 		"tags": "annoyances cookies",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
@@ -310,9 +318,10 @@
 	"adguard-social": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
+		"group2": "social",
+		"parent": null,
 		"off": true,
-		"title": "AdGuard – Social Media",
+		"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",
@@ -321,10 +330,12 @@
 	"fanboy-social": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
+		"group2": "social",
+		"parent": null,
 		"off": true,
 		"title": "EasyList – Social Widgets",
 		"tags": "annoyances social",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
 			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
@@ -341,6 +352,7 @@
 	"fanboy-thirdparty_social": {
 		"content": "filters",
 		"group": "annoyances",
+		"group2": "social",
 		"off": true,
 		"title": "Fanboy – Anti-Facebook",
 		"tags": "privacy",
@@ -398,6 +410,7 @@
 		"off": true,
 		"title": "EasyList – Other Annoyances",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt",
@@ -414,6 +427,7 @@
 		"off": true,
 		"title": "EasyList – Chat Widgets",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-chat.txt",
@@ -430,6 +444,7 @@
 		"off": true,
 		"title": "EasyList – Newsletter Notices",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt"
 		],
@@ -448,6 +463,7 @@
 		"off": true,
 		"title": "EasyList – Notifications",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt"
 		],
@@ -490,6 +506,7 @@
 		"updateAfter": 13,
 		"title": "Peter Lowe’s Ad and tracking server list",
 		"tags": "ads privacy security",
+		"preferred": true,
 		"contentURL": [
 			"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
 			"assets/thirdparties/pgl.yoyo.org/as/serverlist.txt",