From 68539e1fd350959a47ad8fea0f1cef807361b513 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Fri, 5 May 2023 09:53:25 -0400
Subject: [PATCH] Deprecate "Fanboy Annoyances" in `assets.dev.json`

To be replaced with five sublists.

Users who are already subscribed to the list will have to manually
unsubscribe from it, which will be moved to _Custom_ section, and
subscribe to the sublists which have narrower purpose.
---
 assets/assets.dev.json | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/assets/assets.dev.json b/assets/assets.dev.json
index d140b7ae7..28e91f855 100644
--- a/assets/assets.dev.json
+++ b/assets/assets.dev.json
@@ -268,13 +268,19 @@
 		"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
 		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
 	},
-	"fanboy-annoyance": {
+	"easylist-annoyances": {
 		"content": "filters",
 		"group": "annoyances",
         "parent": "EasyList – Annoyances",
 		"off": true,
-		"title": "Fanboy – Annoyances",
-		"contentURL": "https://secure.fanboy.co.nz/fanboy-annoyance_ubo.txt",
+		"title": "EasyList – Other 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"
 	},
 	"fanboy-cookiemonster": {
@@ -296,7 +302,7 @@
 		],
 		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
 	},
-	"fanboy-newsletters": {
+	"easylist-newsletters": {
 		"content": "filters",
 		"group": "annoyances",
         "parent": "EasyList – Annoyances",
@@ -313,7 +319,7 @@
 		],
 		"supportURL": "https://easylist.to/"
 	},
-	"fanboy-notifications": {
+	"easylist-newsletters": {
 		"content": "filters",
 		"group": "annoyances",
         "parent": "EasyList – Annoyances",