Pull reference Easylist assests from own repo

gorhill · Oct 24, 2022 · 2f646db · 2f646db
1 parent ae5717e
commit 2f646db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/assets/assets.json b/assets/assets.json
@@ -176,12 +176,10 @@
 		"group": "ads",
 		"title": "EasyList",
 		"contentURL": [
-			"https://secure.fanboy.co.nz/easylist.txt",
-			"https://easylist.to/easylist/easylist.txt",
+			"https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
 			"assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt"
 		],
 		"cdnURLs": [
-			"https://secure.fanboy.co.nz/easylist.txt",
 			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt",
 			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist.txt",
 			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist.txt",
@@ -228,12 +226,10 @@
 		"group": "privacy",
 		"title": "EasyPrivacy",
 		"contentURL": [
-			"https://secure.fanboy.co.nz/easyprivacy.txt",
-			"https://easylist.to/easylist/easyprivacy.txt",
+			"https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
 			"assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt"
 		],
 		"cdnURLs": [
-			"https://secure.fanboy.co.nz/easyprivacy.txt",
 			"https://gitcdn.link/cdn/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt",
 			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easyprivacy.txt",
 			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easyprivacy.txt",

diff --git a/assets/resources/scriptlets.js b/assets/resources/scriptlets.js
@@ -1754,7 +1754,9 @@
     const regexFromArg = arg => {
         if ( arg === '' ) { return /^/; }
         if ( /^\/.*\/$/.test(arg) ) { return new RegExp(arg.slice(1, -1)); }
-        return new RegExp(arg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+        return new RegExp(
+            arg.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*+/g, '.*?')
+        );
     };
     const reM3u = regexFromArg(m3uPattern);
     const reUrl = regexFromArg(urlPattern);