wip: add subpath ipfs link support too

src/clean-config.ts

@@ -46,7 +46,7 @@ export const cleanBlocklist = (config: Config): Config => {
     // when cleaning the blocklist, we want to:
     // - remove domains that are already present on the blocklist through an equal or less specific match
     // - convert all unicode domains to punycode
-    // - find IPFS subdomain gateway links and store only the CIDs
+    // - find IPFS subdomain or subpath gateway links and store only the CIDs
     // - remove duplicate entries
 
     const blocklistSet = new Set(config.blacklist);
@@ -68,9 +68,15 @@ export const cleanBlocklist = (config: Config): Config => {
         return punycodeDomain;
     }).map(domain => {
         // Extract CID from IPFS subdomain gateway links
-        const ipfsMatch = domain.match(/^(.+)\.ipfs\..+$/);
-        if (ipfsMatch) {
-            return ipfsMatch[1];
+        const ipfsSubdomainMatch = domain.match(/^(.+)\.ipfs\..+$/);
+        if (ipfsSubdomainMatch) {
+            return ipfsSubdomainMatch[1];
+        }
+
+        // Extract CID from IPFS subpath gateway links
+        const ipfsSubpathMatch = domain.match(/^.+\/ipfs\/([^\/]+).*$/);
+        if (ipfsSubpathMatch) {
+            return ipfsSubpathMatch[1];
         }
 
         return domain;